nobu	2014-01-13 09:57:38 +0900 (Mon, 13 Jan 2014)

  New Revision: 44579

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44579

  Log:
    ext: use PRIsVALUE for rb_raise and rb_warn
    
    * ext/bigdecimal/bigdecimal.c (BigDecimal_new): use PRIsVALUE for
      rb_raise() and rb_warn().
    * ext/openssl/ossl_cipher.c (ossl_cipher_init): ditto.
    * ext/racc/cparse/cparse.c (extract_user_token): ditto.
    * ext/syslog/syslog.c (mSyslog_log): ditto.
    
    * ext/openssl/ossl.h (OSSL_Check_Kind, OSSL_Check_Instance): now
      ossl_raise() also accepts PRIsVALUE.
    * ext/openssl/ossl_asn1.c (ossl_asn1_default_tag):

  Modified files:
    trunk/ext/bigdecimal/bigdecimal.c
    trunk/ext/openssl/ossl.h
    trunk/ext/openssl/ossl_asn1.c
    trunk/ext/openssl/ossl_cipher.c
    trunk/ext/racc/cparse/cparse.c
    trunk/ext/syslog/syslog.c
Index: ext/bigdecimal/bigdecimal.c
===================================================================
--- ext/bigdecimal/bigdecimal.c	(revision 44578)
+++ ext/bigdecimal/bigdecimal.c	(revision 44579)
@@ -2518,8 +2518,8 @@ BigDecimal_new(int argc, VALUE *argv) https://github.com/ruby/ruby/blob/trunk/ext/bigdecimal/bigdecimal.c#L2518
       case T_RATIONAL:
 	if (NIL_P(nFig)) {
 	    rb_raise(rb_eArgError,
-		     "can't omit precision for a %s.",
-		     rb_class2name(CLASS_OF(iniValue)));
+		     "can't omit precision for a %"PRIsVALUE".",
+		     rb_obj_class(iniValue));
 	}
 	return GetVpValueWithPrec(iniValue, mf, 1);
 
Index: ext/syslog/syslog.c
===================================================================
--- ext/syslog/syslog.c	(revision 44578)
+++ ext/syslog/syslog.c	(revision 44579)
@@ -312,7 +312,7 @@ static VALUE mSyslog_log(int argc, VALUE https://github.com/ruby/ruby/blob/trunk/ext/syslog/syslog.c#L312
     pri = *argv++;
 
     if (!FIXNUM_P(pri)) {
-      rb_raise(rb_eTypeError, "type mismatch: %s given", rb_class2name(CLASS_OF(pri)));
+	rb_raise(rb_eTypeError, "type mismatch: %"PRIsVALUE" given", rb_obj_class(pri));
     }
 
     syslog_write(FIX2INT(pri), argc, argv);
Index: ext/openssl/ossl_cipher.c
===================================================================
--- ext/openssl/ossl_cipher.c	(revision 44578)
+++ ext/openssl/ossl_cipher.c	(revision 44579)
@@ -213,9 +213,9 @@ ossl_cipher_init(int argc, VALUE *argv, https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_cipher.c#L213
 	 * We deprecated the arguments for this method, but we decided
 	 * keeping this behaviour for backward compatibility.
 	 */
-	const char *cname  = rb_class2name(rb_obj_class(self));
-	rb_warn("arguments for %s#encrypt and %s#decrypt were deprecated; "
-                "use %s#pkcs5_keyivgen to derive key and IV",
+	VALUE cname  = rb_class_path(rb_obj_class(self));
+	rb_warn("arguments for %"PRIsVALUE"#encrypt and %"PRIsVALUE"#decrypt were deprecated; "
+                "use %"PRIsVALUE"#pkcs5_keyivgen to derive key and IV",
                 cname, cname, cname);
 	StringValue(pass);
 	GetCipher(self, ctx);
Index: ext/openssl/ossl.h
===================================================================
--- ext/openssl/ossl.h	(revision 44578)
+++ ext/openssl/ossl.h	(revision 44579)
@@ -95,15 +95,15 @@ extern VALUE eOSSLError; https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl.h#L95
  */
 #define OSSL_Check_Kind(obj, klass) do {\
   if (!rb_obj_is_kind_of((obj), (klass))) {\
-    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected kind of %s)",\
-               rb_obj_classname(obj), rb_class2name(klass));\
+    ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected kind of %"PRIsVALUE")",\
+               rb_obj_class(obj), (klass));\
   }\
 } while (0)
 
 #define OSSL_Check_Instance(obj, klass) do {\
   if (!rb_obj_is_instance_of((obj), (klass))) {\
-    ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected instance of %s)",\
-               rb_obj_classname(obj), rb_class2name(klass));\
+    ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected instance of %"PRIsVALUE")",\
+               rb_obj_class(obj), (klass));\
   }\
 } while (0)
 
Index: ext/openssl/ossl_asn1.c
===================================================================
--- ext/openssl/ossl_asn1.c	(revision 44578)
+++ ext/openssl/ossl_asn1.c	(revision 44579)
@@ -624,8 +624,8 @@ ossl_asn1_default_tag(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_asn1.c#L624
       	}
     	tmp_class = rb_class_superclass(tmp_class);
     }
-    ossl_raise(eASN1Error, "universal tag for %s not found",
-	       rb_class2name(CLASS_OF(obj)));
+    ossl_raise(eASN1Error, "universal tag for %"PRIsVALUE" not found",
+	       rb_obj_class(obj));
 
     return -1; /* dummy */
 }
Index: ext/racc/cparse/cparse.c
===================================================================
--- ext/racc/cparse/cparse.c	(revision 44578)
+++ ext/racc/cparse/cparse.c	(revision 44579)
@@ -418,10 +418,10 @@ extract_user_token(struct cparse_params https://github.com/ruby/ruby/blob/trunk/ext/racc/cparse/cparse.c#L418
 
     if (!RB_TYPE_P(block_args, T_ARRAY)) {
         rb_raise(rb_eTypeError,
-                 "%s() %s %s (must be Array[2])",
+                 "%s() %s %"PRIsVALUE" (must be Array[2])",
                  v->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
                  v->lex_is_iterator ? "yielded" : "returned",
-                 rb_class2name(CLASS_OF(block_args)));
+                 rb_obj_class(block_args));
     }
     if (RARRAY_LEN(block_args) != 2) {
         rb_raise(rb_eArgError,

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/