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

Fix parameter types for rb_ivar_foreach() callbacks

Browse Source 
For this public API, the callback is declared to take
`(ID, VALUE, st_data_t)`, but it so happens that using
`(st_data_t, st_data_t, st_data_t)` also
type checks, because the underlying type is identical.
Use it as declared and get rid of some casts.
This commit is contained in:
Alan Wu 2023-12-05 17:54:37 -05:00
parent 56eccb350b
commit 0346cbbc14
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
error.c
View File

@ -3248,9 +3248,9 @@ exception_dumper(VALUE exc)
} }
static int static int
ivar_copy_i(st_data_t key, st_data_t val, st_data_t exc) ivar_copy_i(ID key, VALUE val, st_data_t exc)
{ {
rb_ivar_set((VALUE) exc, (ID) key, (VALUE) val); rb_ivar_set((VALUE)exc, key, val);
return ST_CONTINUE; return ST_CONTINUE;
} }

12
marshal.c
View File

@ -610,10 +610,8 @@ struct w_ivar_arg {
}; };
static int static int
w_obj_each(st_data_t key, st_data_t val, st_data_t a) w_obj_each(ID id, VALUE value, st_data_t a)
{ {
ID id = (ID)key;
VALUE value = (VALUE)val;
struct w_ivar_arg *ivarg = (struct w_ivar_arg *)a; struct w_ivar_arg *ivarg = (struct w_ivar_arg *)a;
struct dump_call_arg *arg = ivarg->dump; struct dump_call_arg *arg = ivarg->dump;
@ -635,9 +633,8 @@ w_obj_each(st_data_t key, st_data_t val, st_data_t a)
} }
static int static int
obj_count_ivars(st_data_t key, st_data_t val, st_data_t a) obj_count_ivars(ID id, VALUE val, st_data_t a)
{ {
ID id = (ID)key;
if (!to_be_skipped_id(id) && UNLIKELY(!++*(st_index_t *)a)) { if (!to_be_skipped_id(id) && UNLIKELY(!++*(st_index_t *)a)) {
rb_raise(rb_eRuntimeError, "too many instance variables"); rb_raise(rb_eRuntimeError, "too many instance variables");
} }
@ -1683,10 +1680,9 @@ r_leave(VALUE v, struct load_arg *arg, bool partial)
} }
static int static int
copy_ivar_i(st_data_t key, st_data_t val, st_data_t arg) copy_ivar_i(ID vid, VALUE value, st_data_t arg)
{ {
VALUE obj = (VALUE)arg, value = (VALUE)val; VALUE obj = (VALUE)arg;
ID vid = (ID)key;
if (!rb_ivar_defined(obj, vid)) if (!rb_ivar_defined(obj, vid))
rb_ivar_set(obj, vid, value); rb_ivar_set(obj, vid, value);

4
object.c
View File

@ -702,10 +702,8 @@ rb_inspect(VALUE obj)
} }
static int static int
inspect_i(st_data_t k, st_data_t v, st_data_t a) inspect_i(ID id, VALUE value, st_data_t a)
{ {
ID id = (ID)k;
VALUE value = (VALUE)v;
VALUE str = (VALUE)a; VALUE str = (VALUE)a;
/* need not to show internal data */ /* need not to show internal data */

10
variable.c
View File

@ -2127,9 +2127,8 @@ rb_ivar_count(VALUE obj)
} }
static int static int
ivar_i(st_data_t k, st_data_t v, st_data_t a) ivar_i(ID key, VALUE v, st_data_t a)
{ {
ID key = (ID)k;
VALUE ary = (VALUE)a; VALUE ary = (VALUE)a;
if (rb_is_instance_id(key)) { if (rb_is_instance_id(key)) {
@ -3999,9 +3998,8 @@ rb_define_class_variable(VALUE klass, const char *name, VALUE val)
} }
static int static int
cv_i(st_data_t k, st_data_t v, st_data_t a) cv_i(ID key, VALUE v, st_data_t a)
{ {
ID key = (ID)k;
st_table *tbl = (st_table *)a; st_table *tbl = (st_table *)a;
if (rb_is_class_id(key)) { if (rb_is_class_id(key)) {
@ -4216,9 +4214,9 @@ rb_class_ivar_set(VALUE obj, ID id, VALUE val)
} }
static int static int
tbl_copy_i(st_data_t key, st_data_t val, st_data_t dest) tbl_copy_i(ID key, VALUE val, st_data_t dest)
{ {
rb_class_ivar_set(dest, key, val); rb_class_ivar_set((VALUE)dest, key, val);
return ST_CONTINUE; return ST_CONTINUE;
} }