From 98f510451f620931fd32859e4a1bc297df262de7 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 15 Jan 2009 15:39:30 +0000 Subject: 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 --- gc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gc.c') 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()) { -- cgit v1.2.3