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

marshal.c: initialize keywords

Browse Source 
* marshal.c (r_object0): initialize `keywords` and removed
  `keyword_init` flag, to get rid of maybe-uninitialized warning.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-18 01:27:45 +00:00
parent 1c98a41ae3
commit fcb112a172
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
marshal.c
View File

@ -1813,9 +1813,8 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
v = r_entry0(v, idx, arg); v = r_entry0(v, idx, arg);
values = rb_ary_new2(len); values = rb_ary_new2(len);
{ {
VALUE keywords; VALUE keywords = Qfalse;
int keyword_init = RTEST(rb_struct_s_keyword_init(klass)); if (RTEST(rb_struct_s_keyword_init(klass))) {
if (keyword_init) {
keywords = rb_hash_new(); keywords = rb_hash_new();
rb_ary_push(values, keywords); rb_ary_push(values, keywords);
} }
@ -1829,7 +1828,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
rb_class_name(klass), rb_class_name(klass),
slot, n); slot, n);
} }
if (keyword_init) { if (keywords) {
rb_hash_aset(keywords, RARRAY_AREF(mem, i), r_object(arg)); rb_hash_aset(keywords, RARRAY_AREF(mem, i), r_object(arg));
} }
else { else {