diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-03-04 15:49:08 -0800 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-03-04 15:49:08 -0800 |
| commit | 5a153851c3bc4aa96840438441d5a4c96906b299 (patch) | |
| tree | 51feb5fa5d3dcdb675bfdc70847db99d10976309 /src/print.c | |
| parent | f074951adab882fd128f0a763d9dd9eabd00ea24 (diff) | |
| parent | 0e662e3bcd7d2676eadde28018a8306d66bb9775 (diff) | |
| download | mruby-5a153851c3bc4aa96840438441d5a4c96906b299.tar.gz mruby-5a153851c3bc4aa96840438441d5a4c96906b299.zip | |
Merge pull request #947 from monaka/pr-cleanup-stdio-calls-20130304
Cleanup stdio related.
Diffstat (limited to 'src/print.c')
| -rw-r--r-- | src/print.c | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/src/print.c b/src/print.c index 58297ea83..9d8a751f7 100644 --- a/src/print.c +++ b/src/print.c @@ -5,13 +5,12 @@ */ #include "mruby.h" -#ifdef ENABLE_STDIO #include "mruby/string.h" -#include <stdio.h> static void printstr(mrb_state *mrb, mrb_value obj) { +#ifdef ENABLE_STDIO struct RString *str; char *s; int len; @@ -22,14 +21,17 @@ printstr(mrb_state *mrb, mrb_value obj) len = str->len; fwrite(s, len, 1, stdout); } +#endif } void mrb_p(mrb_state *mrb, mrb_value obj) { +#ifdef ENABLE_STDIO obj = mrb_funcall(mrb, obj, "inspect", 0); printstr(mrb, obj); putc('\n', stdout); +#endif } /* 15.3.1.2.9 */ @@ -55,31 +57,22 @@ mrb_init_print(mrb_state *mrb) mrb_define_method(mrb, krn, "__printstr__", mrb_printstr, ARGS_REQ(1)); } - void mrb_show_version(mrb_state *mrb) { - printf("mruby - Embeddable Ruby Copyright (c) 2010-2013 mruby developers\n"); -} + static const char version_msg[] = "mruby - Embeddable Ruby Copyright (c) 2010-2013 mruby developers\n"; + mrb_value msg; -void -mrb_show_copyright(mrb_state *mrb) -{ - printf("mruby - Copyright (c) 2010-2013 mruby developers\n"); -} -#else -void -mrb_p(mrb_state *mrb, mrb_value obj) -{ -} - -void -mrb_show_version(mrb_state *mrb) -{ + msg = mrb_str_new(mrb, version_msg, sizeof(version_msg) - 1); + printstr(mrb, msg); } void mrb_show_copyright(mrb_state *mrb) { + static const char copyright_msg[] = "mruby - Copyright (c) 2010-2013 mruby developers\n"; + mrb_value msg; + + msg = mrb_str_new(mrb, copyright_msg, sizeof(copyright_msg) - 1); + printstr(mrb, msg); } -#endif |