From 7b130004da83adcd7f8641e4fcf105dcf73830b3 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 27 Dec 2022 16:17:43 +0900 Subject: [PATCH] mruby-io/io.c: reorder functions to remove function prototype --- mrbgems/mruby-io/src/io.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c index 86e8bcead..d06de054d 100644 --- a/mrbgems/mruby-io/src/io.c +++ b/mrbgems/mruby-io/src/io.c @@ -913,27 +913,6 @@ mrb_io_s_sysopen(mrb_state *mrb, mrb_value klass) return mrb_fixnum_value(fd); } -static mrb_value mrb_io_sysread_common(mrb_state *mrb, - mrb_io_read_write_size (*readfunc)(int, void *, fsize_t, off_t), - mrb_value io, mrb_value buf, mrb_int maxlen, off_t offset); - -static mrb_io_read_write_size -mrb_sysread_dummy(int fd, void *buf, fsize_t nbytes, off_t offset) -{ - return (mrb_io_read_write_size)read(fd, buf, nbytes); -} - -static mrb_value -mrb_io_sysread(mrb_state *mrb, mrb_value io) -{ - mrb_value buf = mrb_nil_value(); - mrb_int maxlen; - - mrb_get_args(mrb, "i|S", &maxlen, &buf); - - return mrb_io_sysread_common(mrb, mrb_sysread_dummy, io, buf, maxlen, 0); -} - static mrb_value mrb_io_sysread_common(mrb_state *mrb, mrb_io_read_write_size (*readfunc)(int, void *, fsize_t, off_t), @@ -974,6 +953,23 @@ mrb_io_sysread_common(mrb_state *mrb, return buf; } +static mrb_io_read_write_size +mrb_sysread_dummy(int fd, void *buf, fsize_t nbytes, off_t offset) +{ + return (mrb_io_read_write_size)read(fd, buf, nbytes); +} + +static mrb_value +mrb_io_sysread(mrb_state *mrb, mrb_value io) +{ + mrb_value buf = mrb_nil_value(); + mrb_int maxlen; + + mrb_get_args(mrb, "i|S", &maxlen, &buf); + + return mrb_io_sysread_common(mrb, mrb_sysread_dummy, io, buf, maxlen, 0); +} + static mrb_value mrb_io_sysseek(mrb_state *mrb, mrb_value io) {