diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2016-03-31 12:47:06 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2016-04-05 11:37:02 +0200 |
commit | a7581d0859ce5139b2d7795c5ac1f8df0e85815c (patch) | |
tree | eeb93d30f9690d1ee6e96a46685574aeba25ca9d /src/cares_wrap.cc | |
parent | 00c876dec54f9c515aeed78c75ce61a4e0206d95 (diff) | |
download | android-node-v8-a7581d0859ce5139b2d7795c5ac1f8df0e85815c.tar.gz android-node-v8-a7581d0859ce5139b2d7795c5ac1f8df0e85815c.tar.bz2 android-node-v8-a7581d0859ce5139b2d7795c5ac1f8df0e85815c.zip |
src: replace ARRAY_SIZE with typesafe arraysize
To prevent `ARRAY_SIZE(&arg)` (i.e., taking the array size of a pointer)
from happening again.
PR-URL: https://github.com/nodejs/node/pull/5969
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src/cares_wrap.cc')
-rw-r--r-- | src/cares_wrap.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index a23b839fbb..6bd73ae3ba 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -310,7 +310,7 @@ class QueryWrap : public AsyncWrap { Integer::New(env()->isolate(), 0), answer }; - MakeCallback(env()->oncomplete_string(), ARRAY_SIZE(argv), argv); + MakeCallback(env()->oncomplete_string(), arraysize(argv), argv); } void CallOnComplete(Local<Value> answer, Local<Value> family) { @@ -321,7 +321,7 @@ class QueryWrap : public AsyncWrap { answer, family }; - MakeCallback(env()->oncomplete_string(), ARRAY_SIZE(argv), argv); + MakeCallback(env()->oncomplete_string(), arraysize(argv), argv); } void ParseError(int status) { @@ -1037,7 +1037,7 @@ void AfterGetAddrInfo(uv_getaddrinfo_t* req, int status, struct addrinfo* res) { uv_freeaddrinfo(res); // Make the callback into JavaScript - req_wrap->MakeCallback(env->oncomplete_string(), ARRAY_SIZE(argv), argv); + req_wrap->MakeCallback(env->oncomplete_string(), arraysize(argv), argv); delete req_wrap; } @@ -1068,7 +1068,7 @@ void AfterGetNameInfo(uv_getnameinfo_t* req, } // Make the callback into JavaScript - req_wrap->MakeCallback(env->oncomplete_string(), ARRAY_SIZE(argv), argv); + req_wrap->MakeCallback(env->oncomplete_string(), arraysize(argv), argv); delete req_wrap; } |