From c39ee489e172750a75a943e6e58e65cfc4fbd7d3 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 22 Nov 2022 18:18:30 +0900 Subject: [PATCH] Remove non formatting fprintf(). --- mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c | 2 +- mrbgems/mruby-test/driver.c | 2 +- src/backtrace.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c index ef806bdf0..505d45092 100644 --- a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c +++ b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c @@ -346,7 +346,7 @@ main(int argc, char **argv) } } else { - fprintf(stderr, "Output file is required\n"); + fputs("Output file is required\n", stderr); return EXIT_FAILURE; } result = dump_file(mrb, wfp, args.outfile, mrb_proc_ptr(load), &args); diff --git a/mrbgems/mruby-test/driver.c b/mrbgems/mruby-test/driver.c index fdb7c974a..7e94df165 100644 --- a/mrbgems/mruby-test/driver.c +++ b/mrbgems/mruby-test/driver.c @@ -290,7 +290,7 @@ main(int argc, char **argv) /* new interpreter instance */ mrb = mrb_open(); if (mrb == NULL) { - fprintf(stderr, "Invalid mrb_state, exiting test driver"); + fputs("Invalid mrb_state, exiting test driver", stderr); return EXIT_FAILURE; } diff --git a/src/backtrace.c b/src/backtrace.c index 12f835660..4a0fdc118 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -105,25 +105,27 @@ print_backtrace(mrb_state *mrb, struct RObject *exc, struct RArray *backtrace) if (n != 0) { if (n > 1) { - fprintf(stderr, "trace (most recent call last):\n"); + fputs("trace (most recent call last):\n", stderr); } for (i=n-1,loc=&ARY_PTR(backtrace)[i]; i>0; i--,loc--) { if (mrb_string_p(*loc)) { - fprintf(stderr, "\t[%d] %.*s\n", - (int)i, (int)RSTRING_LEN(*loc), RSTRING_PTR(*loc)); + fprintf(stderr, "\t[%d] ", (int)i); + fwrite(RSTRING_PTR(*loc), (int)RSTRING_LEN(*loc), 1, stderr); + fputc('\n', stderr); } } if (mrb_string_p(*loc)) { - fprintf(stderr, "%.*s: ", (int)RSTRING_LEN(*loc), RSTRING_PTR(*loc)); + fwrite(RSTRING_PTR(*loc), (int)RSTRING_LEN(*loc), 1, stderr); + fputs(": ", stderr); } } else { - fprintf(stderr, "%s:0: ", "(unknown)"); + fputs("(unknown):0: ", stderr); } if (exc == mrb->nomem_err) { static const char nomem[] = "Out of memory (NoMemoryError)\n"; - fwrite(nomem, sizeof(nomem) - 1, 1, stderr); + fwrite(nomem, sizeof(nomem)-1, 1, stderr); } else { mesg = mrb_exc_inspect(mrb, mrb_obj_value(exc));