diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ext/curses/curses.c | 2 | ||||
| -rw-r--r-- | ext/io/wait/wait.c | 3 | ||||
| -rw-r--r-- | pack.c | 7 |
4 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,13 @@ +Mon Jul 17 22:55:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/io/wait/wait.c (io_ready_p): protoize. + +Mon Jul 17 13:43:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * pack.c (define_swapx): should not use plain malloc. + + * ext/curses/curses.c (curses_getmouse): ditto. + Mon Jul 17 12:58:41 2006 WATANABE Hirofumi <eban@ruby-lang.org> * configure.in: should use ac_cv_lib_dl_dlopen=no on MinGW. diff --git a/ext/curses/curses.c b/ext/curses/curses.c index f1d037b19d..5d5fdb567f 100644 --- a/ext/curses/curses.c +++ b/ext/curses/curses.c @@ -646,7 +646,7 @@ curses_getmouse(VALUE obj) val = Data_Make_Struct(cMouseEvent,struct mousedata, 0,curses_mousedata_free,mdata); - mdata->mevent = (MEVENT*)malloc(sizeof(MEVENT)); + mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT)); return (getmouse(mdata->mevent) == OK) ? val : Qnil; } diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c index 13daaf6b53..4b95698ce7 100644 --- a/ext/io/wait/wait.c +++ b/ext/io/wait/wait.c @@ -53,8 +53,7 @@ EXTERN struct timeval rb_time_interval _((VALUE time)); =end */ static VALUE -io_ready_p(io) - VALUE io; +io_ready_p(VALUE io) { OpenFile *fptr; ioctl_arg n; @@ -52,18 +52,17 @@ #define define_swapx(x, xtype) \ static xtype \ -TOKEN_PASTE(swap,x)(z) \ - xtype z; \ +TOKEN_PASTE(swap,x)(xtype z) \ { \ xtype r; \ xtype *zp; \ unsigned char *s, *t; \ int i; \ \ - zp = malloc(sizeof(xtype)); \ + zp = xmalloc(sizeof(xtype)); \ *zp = z; \ s = (unsigned char*)zp; \ - t = malloc(sizeof(xtype)); \ + t = xmalloc(sizeof(xtype)); \ for (i=0; i<sizeof(xtype); i++) { \ t[sizeof(xtype)-i-1] = s[i]; \ } \ |