summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/openssl/ossl.c3
-rw-r--r--gc.c4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7dbd5d6..214ac4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 14 22:38:30 2009 Tanaka Akira <akr@fsij.org>
+
+ * gc.c (negative_size_allocation_error_with_gvl): abolish a warning.
+ (negative_size_allocation_error): ditto.
+
+ * ext/openssl/ossl.c (ossl_raise): ditto.
+
Wed Jan 14 20:05:05 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
* enc/trans/gb18030.trans, gb18030-tbl.rb:
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 9df7c59..28696ca 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 57bd47e..3d41445 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()) {