diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-30 23:48:21 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-30 23:48:21 +0000 |
commit | f91a5563400156bbacc6373a2dea0dcaf182a433 (patch) | |
tree | 2b940be6807f78c48b3b263f20e1e8141d6d9496 | |
parent | b49075cdf15a733cf7a9b1f9ce9d06c40828db3d (diff) |
* struct.c (struct_member_pos): avoid implicit conversion loses
integer precision: 'long' to 'int'.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | struct.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Jul 1 08:47:24 2015 NARUSE, Yui <naruse@ruby-lang.org> + + * struct.c (struct_member_pos): avoid implicit conversion loses + integer precision: 'long' to 'int'. + Wed Jul 1 05:57:03 2015 Eric Wong <e@80x24.org> * vm_method.c (rb_add_method_iseq): add RB_GC_GUARD @@ -131,7 +131,7 @@ struct_member_pos(VALUE s, VALUE name) { VALUE back = struct_ivar_get(rb_obj_class(s), id_back_members); VALUE const * p; - long j, mask; + int j, mask; if (UNLIKELY(NIL_P(back))) { rb_raise(rb_eTypeError, "uninitialized struct"); @@ -141,12 +141,12 @@ struct_member_pos(VALUE s, VALUE name) } p = RARRAY_CONST_PTR(back); - mask = RARRAY_LEN(back); + mask = RARRAY_LENINT(back); if (mask <= AREF_HASH_THRESHOLD) { if (UNLIKELY(RSTRUCT_LEN(s) != RARRAY_LEN(back))) { rb_raise(rb_eTypeError, - "struct size differs (%ld required %ld given)", + "struct size differs (%d required %ld given)", mask, RSTRUCT_LEN(s)); } for (j = 0; j < mask; j++) { |