diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-05 01:09:17 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-05 01:09:17 +0000 |
| commit | 57e2877e7b8257665f07f63aa37ed09f8fe78310 (patch) | |
| tree | 1f9d2f407d43672c5a2fa4aaeaa8cfd1255b2f32 /ext/fiddle | |
| parent | a015a01354d7f185eb794e3280c4168c2cb38100 (diff) | |
| download | ruby-57e2877e7b8257665f07f63aa37ed09f8fe78310.tar.gz | |
ext: use RARRAY_AREF
* ext/**/*.c: prefer RARRAY_AREF to indexing RARRAY_CONST_PTR.
pointed out by hanmac.
https://github.com/ruby/ruby/commit/3553a86#commitcomment-14187670
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/fiddle')
| -rw-r--r-- | ext/fiddle/closure.c | 4 | ||||
| -rw-r--r-- | ext/fiddle/function.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c index 502f47f037..5d8a3d200f 100644 --- a/ext/fiddle/closure.c +++ b/ext/fiddle/closure.c @@ -70,7 +70,7 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx) cPointer = rb_const_get(mFiddle, rb_intern("Pointer")); for (i = 0; i < argc; i++) { - type = NUM2INT(RARRAY_CONST_PTR(rbargs)[i]); + type = NUM2INT(RARRAY_AREF(rbargs, i)); switch (type) { case TYPE_VOID: argc = 0; @@ -210,7 +210,7 @@ initialize(int rbargc, VALUE argv[], VALUE self) cl->argv = (ffi_type **)xcalloc(argc + 1, sizeof(ffi_type *)); for (i = 0; i < argc; i++) { - int type = NUM2INT(RARRAY_CONST_PTR(args)[i]); + int type = NUM2INT(RARRAY_AREF(args, i)); cl->argv[i] = INT2FFI_TYPE(type); } cl->argv[argc] = NULL; diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c index 9db29e8bd6..209c03f71e 100644 --- a/ext/fiddle/function.c +++ b/ext/fiddle/function.c @@ -110,7 +110,7 @@ initialize(int argc, VALUE argv[], VALUE self) arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *)); for (i = 0; i < RARRAY_LEN(args); i++) { - int type = NUM2INT(RARRAY_CONST_PTR(args)[i]); + int type = NUM2INT(RARRAY_AREF(args, i)); arg_types[i] = INT2FFI_TYPE(type); } arg_types[RARRAY_LEN(args)] = NULL; @@ -164,7 +164,7 @@ function_call(int argc, VALUE argv[], VALUE self) values = (void **)((char *)generic_args + (size_t)argc * sizeof(fiddle_generic)); for (i = 0; i < argc; i++) { - VALUE type = RARRAY_CONST_PTR(types)[i]; + VALUE type = RARRAY_AREF(types, i); VALUE src = argv[i]; if(NUM2INT(type) == TYPE_VOIDP) { |