From 98f510451f620931fd32859e4a1bc297df262de7 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 15 Jan 2009 15:39:30 +0000 Subject: [PATCH] merges r21510 from trunk into ruby_1_9_1. * gc.c (negative_size_allocation_error_with_gvl): abolish a warning. (negative_size_allocation_error): ditto. * ext/openssl/ossl.c (ossl_raise): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/openssl/ossl.c | 3 +-- gc.c | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3e687d501..a46b4db6b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jan 14 22:38:30 2009 Tanaka Akira + + * gc.c (negative_size_allocation_error_with_gvl): abolish a warning. + (negative_size_allocation_error): ditto. + + * ext/openssl/ossl.c (ossl_raise): ditto. + Thu Jan 15 13:10:58 2009 NAKAMURA Usaku * win32/Makefile.sub (COMPILERFLAG): for enc/trans/gb18030.c. diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 9df7c59d2b..28696cabe2 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -296,8 +296,7 @@ ossl_raise(VALUE exc, const char *fmt, ...) msg = ERR_error_string(e, NULL); else msg = ERR_reason_error_string(e); - fmt = len ? ": %s" : "%s"; - len += snprintf(buf+len, BUFSIZ-len, fmt, msg); + len += snprintf(buf+len, BUFSIZ-len, "%s%s", (len ? ": " : ""), msg); } if (dOSSL == Qtrue){ /* show all errors on the stack */ while ((e = ERR_get_error()) != 0){ diff --git a/gc.c b/gc.c index 57bd47effd..3d41445533 100644 --- a/gc.c +++ b/gc.c @@ -558,7 +558,7 @@ gc_profile_clear(void) static void * negative_size_allocation_error_with_gvl(void *ptr) { - rb_raise(rb_eNoMemError, (const char *)ptr); + rb_raise(rb_eNoMemError, "%s", (const char *)ptr); return 0; /* should not be reached */ } @@ -566,7 +566,7 @@ static void negative_size_allocation_error(const char *msg) { if (ruby_thread_has_gvl_p()) { - rb_raise(rb_eNoMemError, msg); + rb_raise(rb_eNoMemError, "%s", msg); } else { if (ruby_native_thread_p()) {