diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/curses/curses.c | 12 | ||||
| -rw-r--r-- | ext/dbm/dbm.c | 2 | ||||
| -rw-r--r-- | ext/md5/md5init.c | 2 | ||||
| -rw-r--r-- | ext/nkf/orig/nkf.c | 20 | ||||
| -rw-r--r-- | ext/socket/socket.c | 2 |
5 files changed, 23 insertions, 15 deletions
diff --git a/ext/curses/curses.c b/ext/curses/curses.c index 89396a805f..49fa07bd5c 100644 --- a/ext/curses/curses.c +++ b/ext/curses/curses.c @@ -412,11 +412,13 @@ window_s_new(class, lines, cols, top, left) { VALUE w; WINDOW *window; + VALUE args[4]; window = newwin(NUM2INT(lines), NUM2INT(cols), NUM2INT(top), NUM2INT(left)); wclear(window); w = prep_window(class, window); - rb_obj_call_init(w); + args[0] = lines; args[1] = cols; args[2] = top; args[3] = left; + rb_obj_call_init(w, 4, args); return w; } @@ -432,11 +434,17 @@ window_subwin(obj, lines, cols, top, left) { struct windata *winp; WINDOW *window; + VALUE w; + VALUE args[4]; GetWINDOW(obj, winp); window = subwin(winp->window, NUM2INT(lines), NUM2INT(cols), NUM2INT(top), NUM2INT(left)); - return prep_window(cWindow, window); + w = prep_window(cWindow, window); + args[0] = lines; args[1] = cols; args[2] = top; args[3] = left; + rb_obj_call_init(w, 4, args); + + return w; } /* def close */ diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index 2764a325e1..c4a47e8004 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -84,7 +84,7 @@ fdbm_s_open(argc, argv, klass) obj = Data_Make_Struct(klass,struct dbmdata,0,free_dbm,dbmp); dbmp->di_dbm = dbm; dbmp->di_size = -1; - rb_obj_call_init(obj); + rb_obj_call_init(obj, argc, argv); return obj; } diff --git a/ext/md5/md5init.c b/ext/md5/md5init.c index a825f96d47..e95e135812 100644 --- a/ext/md5/md5init.c +++ b/ext/md5/md5init.c @@ -77,7 +77,7 @@ md5_new(argc, argv, class) if (!NIL_P(arg)) { md5_update(obj, arg); } - rb_obj_call_init(obj); + rb_obj_call_init(obj, argc, argv); return obj; } diff --git a/ext/nkf/orig/nkf.c b/ext/nkf/orig/nkf.c index 8de08a8b36..5a350ae666 100644 --- a/ext/nkf/orig/nkf.c +++ b/ext/nkf/orig/nkf.c @@ -257,9 +257,9 @@ int line_fold(); # define DEFAULT_CONV e_oconv #endif -static void (*iconv)(int c2,int c1); +static void (*iconv) _((int c2,int c1)); /* s_iconv or oconv */ -static void (*oconv)(int c2,int c1) = DEFAULT_CONV; +static void (*oconv) _((int c2,int c1)) = DEFAULT_CONV; /* [ejs]_oconv */ /* Global states */ @@ -464,7 +464,7 @@ main(argc, argv) } #endif -void +static void arguments(cp) char *cp; { @@ -1049,7 +1049,7 @@ h_conv(f, c2, c1) -int +static int push_hold_buf(c2, c1) int c2, c1; { @@ -1323,7 +1323,7 @@ j_oconv(c2, c1) This is the main difference from fmt. */ -int +static int line_fold(c2,c1) int c2,c1; { @@ -1446,7 +1446,7 @@ int c2,c1; } } -int +static int pre_convert(c1,c2) int c1,c2; { @@ -1513,7 +1513,7 @@ int iso8859_f_save; #define nkf_toupper(c) (('a'<=c && c<='z')?(c-('a'-'A')):c) /* I don't trust portablity of toupper */ -int +static int mime_begin(f) FILE *f; { @@ -1620,7 +1620,7 @@ FILE *f; #endif -int +static int mime_getc(f) FILE *f; { @@ -1778,7 +1778,7 @@ mime_integrity(f,p) } #endif -int +static int base64decode(c) int c; { @@ -1797,7 +1797,7 @@ base64decode(c) return (i); } -void +static void reinit() { unbuf_f = FALSE; diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 875c8aa5fb..66bf56a251 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -102,7 +102,7 @@ sock_new(class, fd) fp->f2 = rb_fdopen(fd, "w"); fp->mode = FMODE_READWRITE; rb_io_unbuffered(fp); - rb_obj_call_init((VALUE)sock); + rb_obj_call_init((VALUE)sock, 0, 0); return (VALUE)sock; } |