1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hash.c: use rb_check_arity

Browse Source 
* hash.c (rb_hash_initialize, rb_hash_fetch_m, rb_hash_default):
  use rb_check_arity over rb_scan_args.
  (env_fetch): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-07-02 08:25:21 +00:00
parent 18a9926ad9
commit 255adda52f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hash.c
View File

@ -499,7 +499,8 @@ rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
FL_SET(hash, HASH_PROC_DEFAULT); FL_SET(hash, HASH_PROC_DEFAULT);
} }
else { else {
rb_scan_args(argc, argv, "01", &ifnone); rb_check_arity(argc, 0, 1);
ifnone = argc == 0 ? Qnil : argv[0];
RHASH_SET_IFNONE(hash, ifnone); RHASH_SET_IFNONE(hash, ifnone);
} }
@ -766,11 +767,12 @@ rb_hash_lookup(VALUE hash, VALUE key)
static VALUE static VALUE
rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash) rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
{ {
VALUE key, if_none; VALUE key;
st_data_t val; st_data_t val;
long block_given; long block_given;
rb_scan_args(argc, argv, "11", &key, &if_none); rb_check_arity(argc, 1, 2);
key = argv[0];
block_given = rb_block_given_p(); block_given = rb_block_given_p();
if (block_given && argc == 2) { if (block_given && argc == 2) {
@ -786,7 +788,7 @@ rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
desc = rb_str_ellipsize(desc, 65); desc = rb_str_ellipsize(desc, 65);
rb_raise(rb_eKeyError, "key not found: %"PRIsVALUE, desc); rb_raise(rb_eKeyError, "key not found: %"PRIsVALUE, desc);
} }
return if_none; return argv[1];
} }
return (VALUE)val; return (VALUE)val;
} }
@ -823,7 +825,8 @@ rb_hash_default(int argc, VALUE *argv, VALUE hash)
{ {
VALUE key, ifnone; VALUE key, ifnone;
rb_scan_args(argc, argv, "01", &key); rb_check_arity(argc, 0, 1);
key = argv[0];
ifnone = RHASH_IFNONE(hash); ifnone = RHASH_IFNONE(hash);
if (FL_TEST(hash, HASH_PROC_DEFAULT)) { if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
if (argc == 0) return Qnil; if (argc == 0) return Qnil;
@ -2637,11 +2640,12 @@ rb_f_getenv(VALUE obj, VALUE name)
static VALUE static VALUE
env_fetch(int argc, VALUE *argv) env_fetch(int argc, VALUE *argv)
{ {
VALUE key, if_none; VALUE key;
long block_given; long block_given;
const char *nam, *env; const char *nam, *env;
rb_scan_args(argc, argv, "11", &key, &if_none); rb_check_arity(argc, 1, 2);
key = argv[0];
block_given = rb_block_given_p(); block_given = rb_block_given_p();
if (block_given && argc == 2) { if (block_given && argc == 2) {
rb_warn("block supersedes default value argument"); rb_warn("block supersedes default value argument");
@ -2653,7 +2657,7 @@ env_fetch(int argc, VALUE *argv)
if (argc == 1) { if (argc == 1) {
rb_raise(rb_eKeyError, "key not found: \"%"PRIsVALUE"\"", key); rb_raise(rb_eKeyError, "key not found: \"%"PRIsVALUE"\"", key);
} }
return if_none; return argv[1];
} }
if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env)) if (ENVMATCH(nam, PATH_ENV) && !env_path_tainted(env))
return env_path_str_new(env); return env_path_str_new(env);