kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ext: use PRIsVALUE for rb_raise and rb_warn

Browse source 
* 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):

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-01-13 00:57:38 +00:00
parent 7e9bd8f72c
commit eadaa8ba8b
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/bigdecimal/bigdecimal.c
View file

@ -2518,8 +2518,8 @@ BigDecimal_new(int argc, VALUE *argv)
case T_RATIONAL: case T_RATIONAL:
if (NIL_P(nFig)) { if (NIL_P(nFig)) {
rb_raise(rb_eArgError, rb_raise(rb_eArgError,
"can't omit precision for a %s.", "can't omit precision for a %"PRIsVALUE".",
rb_class2name(CLASS_OF(iniValue))); rb_obj_class(iniValue));
} }
return GetVpValueWithPrec(iniValue, mf, 1); return GetVpValueWithPrec(iniValue, mf, 1);

8
ext/openssl/ossl.h
View file

@ -95,15 +95,15 @@ extern VALUE eOSSLError;
*/ */
#define OSSL_Check_Kind(obj, klass) do {\ #define OSSL_Check_Kind(obj, klass) do {\
if (!rb_obj_is_kind_of((obj), (klass))) {\ if (!rb_obj_is_kind_of((obj), (klass))) {\
ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected kind of %s)",\ ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected kind of %"PRIsVALUE")",\
rb_obj_classname(obj), rb_class2name(klass));\ rb_obj_class(obj), (klass));\
}\ }\
} while (0) } while (0)
#define OSSL_Check_Instance(obj, klass) do {\ #define OSSL_Check_Instance(obj, klass) do {\
if (!rb_obj_is_instance_of((obj), (klass))) {\ if (!rb_obj_is_instance_of((obj), (klass))) {\
ossl_raise(rb_eTypeError, "wrong argument (%s)! (Expected instance of %s)",\ ossl_raise(rb_eTypeError, "wrong argument (%"PRIsVALUE")! (Expected instance of %"PRIsVALUE")",\
rb_obj_classname(obj), rb_class2name(klass));\ rb_obj_class(obj), (klass));\
}\ }\
} while (0) } while (0)

4
ext/openssl/ossl_asn1.c
View file

@ -624,8 +624,8 @@ ossl_asn1_default_tag(VALUE obj)
} }
tmp_class = rb_class_superclass(tmp_class); tmp_class = rb_class_superclass(tmp_class);
} }
ossl_raise(eASN1Error, "universal tag for %s not found", ossl_raise(eASN1Error, "universal tag for %"PRIsVALUE" not found",
rb_class2name(CLASS_OF(obj))); rb_obj_class(obj));
return -1; /* dummy */ return -1; /* dummy */
} }

6
ext/openssl/ossl_cipher.c
View file

@ -213,9 +213,9 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
* We deprecated the arguments for this method, but we decided * We deprecated the arguments for this method, but we decided
* keeping this behaviour for backward compatibility. * keeping this behaviour for backward compatibility.
*/ */
const char *cname = rb_class2name(rb_obj_class(self)); VALUE cname = rb_class_path(rb_obj_class(self));
rb_warn("arguments for %s#encrypt and %s#decrypt were deprecated; " rb_warn("arguments for %"PRIsVALUE"#encrypt and %"PRIsVALUE"#decrypt were deprecated; "
"use %s#pkcs5_keyivgen to derive key and IV", "use %"PRIsVALUE"#pkcs5_keyivgen to derive key and IV",
cname, cname, cname); cname, cname, cname);
StringValue(pass); StringValue(pass);
GetCipher(self, ctx); GetCipher(self, ctx);

4
ext/racc/cparse/cparse.c
View file

@ -418,10 +418,10 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
if (!RB_TYPE_P(block_args, T_ARRAY)) { if (!RB_TYPE_P(block_args, T_ARRAY)) {
rb_raise(rb_eTypeError, 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 ? rb_id2name(v->lexmid) : "next_token",
v->lex_is_iterator ? "yielded" : "returned", v->lex_is_iterator ? "yielded" : "returned",
rb_class2name(CLASS_OF(block_args))); rb_obj_class(block_args));
} }
if (RARRAY_LEN(block_args) != 2) { if (RARRAY_LEN(block_args) != 2) {
rb_raise(rb_eArgError, rb_raise(rb_eArgError,

2
ext/syslog/syslog.c
View file

@ -312,7 +312,7 @@ static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
pri = *argv++; pri = *argv++;
if (!FIXNUM_P(pri)) { 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); syslog_write(FIX2INT(pri), argc, argv);