aboutsummaryrefslogtreecommitdiffstats
path: root/hash.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-28 08:03:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-28 08:03:19 +0000
commitbec1492ee5bd01390bcba549bfb63ac92e12ef6a (patch)
tree517813b0026ed773fe9a953705d45e02b31bd4b6 /hash.c
parent9d1fb6ad429bd11f57542bc47c09e509761245cc (diff)
downloadruby-bec1492ee5bd01390bcba549bfb63ac92e12ef6a.tar.gz
hash.c: dry up code
* hash.c (rb_hash_update_{block,func}_callback): dry up hash update callback code. [Fix GH-1338] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/hash.c b/hash.c
index dfc54f0bb9..19f565ad74 100644
--- a/hash.c
+++ b/hash.c
@@ -2291,12 +2291,11 @@ rb_hash_update_block_callback(st_data_t *key, st_data_t *value, struct update_ar
if (existing) {
newvalue = rb_yield_values(3, (VALUE)*key, (VALUE)*value, newvalue);
arg->old_value = *value;
- arg->new_value = newvalue;
}
else {
arg->new_key = *key;
- arg->new_value = newvalue;
}
+ arg->new_value = newvalue;
*value = newvalue;
return ST_CONTINUE;
}
@@ -2362,12 +2361,11 @@ rb_hash_update_func_callback(st_data_t *key, st_data_t *value, struct update_arg
if (existing) {
newvalue = (*uf_arg->func)((VALUE)*key, (VALUE)*value, newvalue);
arg->old_value = *value;
- arg->new_value = newvalue;
}
else {
arg->new_key = *key;
- arg->new_value = newvalue;
}
+ arg->new_value = newvalue;
*value = newvalue;
return ST_CONTINUE;
}