From ea1edc966af6dd39aa5b6eb05a97a30d70d10c91 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 10 Dec 2003 08:26:36 +0000 Subject: * io.c (read_all): should return given string even if data read is empty. [ruby-dev:22207] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/curses/curses.c | 6 ++---- ext/iconv/iconv.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'ext') diff --git a/ext/curses/curses.c b/ext/curses/curses.c index 2e60b2160..106c43da4 100644 --- a/ext/curses/curses.c +++ b/ext/curses/curses.c @@ -621,7 +621,7 @@ curses_pair_number(VALUE obj, VALUE attrs) { return INT2FIX(PAIR_NUMBER(NUM2INT(attrs))); } -#endif +#endif /* USE_COLOR */ #ifdef USE_MOUSE struct mousedata { @@ -1443,7 +1443,7 @@ Init_curses() #endif /* USE_COLOR */ #ifdef USE_MOUSE rb_define_module_function(mCurses, "getmouse", curses_getmouse, 0); - rb_define_module_function(mCurses, "ungetmouse", curses_getmouse, 1); + rb_define_module_function(mCurses, "ungetmouse", curses_ungetmouse, 1); rb_define_module_function(mCurses, "mouseinterval", curses_mouseinterval, 1); rb_define_module_function(mCurses, "mousemask", curses_mousemask, 1); #endif /* USE_MOUSE */ @@ -1489,14 +1489,12 @@ Init_curses() rb_define_method(cWindow, "keypad", window_keypad, 1); rb_define_method(cWindow, "keypad=", window_keypad, 1); -#ifdef USE_COLOR rb_define_method(cWindow, "attroff", window_attroff, 1); rb_define_method(cWindow, "attron", window_attron, 1); rb_define_method(cWindow, "attrset", window_attrset, 1); rb_define_method(cWindow, "bkgdset", window_bkgdset, 1); rb_define_method(cWindow, "bkgd", window_bkgd, 1); rb_define_method(cWindow, "getbkgd", window_getbkgd, 0); -#endif /* USE_COLOR */ rb_define_method(cWindow, "nodelay=", window_nodelay, 1); rb_define_method(cWindow, "timeout=", window_timeout, 1); diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 90bf024af..532779785 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -426,7 +426,7 @@ iconv_convert } else { /* Some iconv() have a bug, return *outlen out of range */ - sprintf(errmsg, "bug?(output length = %d)", sizeof(buffer) - outlen); + sprintf(errmsg, "bug?(output length = %ld)", sizeof(buffer) - outlen); error = rb_eIconvOutOfRange; } @@ -836,7 +836,6 @@ void Init_iconv _((void)) { VALUE rb_cIconv = rb_define_class("Iconv", rb_cData); - VALUE metaclass = RBASIC(rb_cIconv)->klass; rb_define_alloc_func(rb_cIconv, iconv_s_allocate); rb_define_singleton_method(rb_cIconv, "open", iconv_s_open, 2); -- cgit