From 57e2877e7b8257665f07f63aa37ed09f8fe78310 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 5 Nov 2015 01:09:17 +0000 Subject: 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 --- ext/socket/ancdata.c | 2 +- ext/socket/socket.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ext/socket') diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index ed242db89d..afa75ef472 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -207,7 +207,7 @@ ancillary_s_unix_rights(int argc, VALUE *argv, VALUE klass) str = rb_str_buf_new(sizeof(int) * argc); for (i = 0 ; i < argc; i++) { - VALUE obj = RARRAY_CONST_PTR(ary)[i]; + VALUE obj = RARRAY_AREF(ary, i); rb_io_t *fptr; int fd; GetOpenFile(obj, fptr); diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 30bc625c9f..8a3541ac30 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1406,16 +1406,16 @@ sock_s_getnameinfo(int argc, VALUE *argv) sa = tmp; MEMZERO(&hints, struct addrinfo, 1); if (RARRAY_LEN(sa) == 3) { - af = RARRAY_CONST_PTR(sa)[0]; - port = RARRAY_CONST_PTR(sa)[1]; - host = RARRAY_CONST_PTR(sa)[2]; + af = RARRAY_AREF(sa, 0); + port = RARRAY_AREF(sa, 1); + host = RARRAY_AREF(sa, 2); } else if (RARRAY_LEN(sa) >= 4) { - af = RARRAY_CONST_PTR(sa)[0]; - port = RARRAY_CONST_PTR(sa)[1]; - host = RARRAY_CONST_PTR(sa)[3]; + af = RARRAY_AREF(sa, 0); + port = RARRAY_AREF(sa, 1); + host = RARRAY_AREF(sa, 3); if (NIL_P(host)) { - host = RARRAY_CONST_PTR(sa)[2]; + host = RARRAY_AREF(sa, 2); } else { /* -- cgit v1.2.3