diff options
| -rw-r--r-- | tools/mirb/mirb.c | 13 | ||||
| -rw-r--r-- | tools/mrbc/mrbc.c | 3 | ||||
| -rw-r--r-- | tools/mruby/mruby.c | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/tools/mirb/mirb.c b/tools/mirb/mirb.c index d510f413b..502400c72 100644 --- a/tools/mirb/mirb.c +++ b/tools/mirb/mirb.c @@ -143,7 +143,9 @@ print_cmdline(int code_block_open) int main(void) { - char last_char, ruby_code[1024], last_code_line[1024]; + char last_char; + char ruby_code[1024] = { 0 }; + char last_code_line[1024] = { 0 }; int char_index; mrbc_context *cxt; struct mrb_parser_state *parser; @@ -163,8 +165,6 @@ main(void) cxt = mrbc_context_new(mrb); cxt->capture_errors = 1; - memset(ruby_code, 0, sizeof(*ruby_code)); - memset(last_code_line, 0, sizeof(*last_code_line)); while (TRUE) { print_cmdline(code_block_open); @@ -197,8 +197,7 @@ main(void) strcat(ruby_code, last_code_line); } else { - memset(ruby_code, 0, sizeof(*ruby_code)); - strcat(ruby_code, last_code_line); + strcpy(ruby_code, last_code_line); } } @@ -238,8 +237,8 @@ main(void) p(mrb, result); } } - memset(ruby_code, 0, sizeof(*ruby_code)); - memset(ruby_code, 0, sizeof(*last_code_line)); + ruby_code[0] = '\0'; + last_code_line[0] = '\0'; mrb_parser_free(parser); } } diff --git a/tools/mrbc/mrbc.c b/tools/mrbc/mrbc.c index 94675c391..5382b90a8 100644 --- a/tools/mrbc/mrbc.c +++ b/tools/mrbc/mrbc.c @@ -70,8 +70,9 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) char *infile = NULL; char *outfile = NULL; char **origargv = argv; + static const struct _args args_zero = { 0 }; - memset(args, 0, sizeof(*args)); + *args = args_zero; args->ext = RITEBIN_EXT; for (argc--,argv++; argc > 0; argc--,argv++) { diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index 2719bad01..444170270 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -57,8 +57,9 @@ static int parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) { char **origargv = argv; + static const struct _args args_zero = { 0 }; - memset(args, 0, sizeof(*args)); + *args = args_zero; for (argc--,argv++; argc > 0; argc--,argv++) { char *item; |