From b2803637e867e47318936f388ba2ec52932111f6 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 13 Apr 2017 07:20:04 +0200 Subject: [PATCH] src: replace IsConstructCall functions with lambda I noticed that there are three static functions that only check if args is a construct call. This commit suggests replacing them and them with a lambda. PR-URL: https://github.com/nodejs/node/pull/12384 Reviewed-By: Anna Henningsen Reviewed-By: Colin Ihrig Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell --- src/cares_wrap.cc | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc index 2ff1470d60..7a9102ff3d 100644 --- a/src/cares_wrap.cc +++ b/src/cares_wrap.cc @@ -115,11 +115,6 @@ GetAddrInfoReqWrap::GetAddrInfoReqWrap(Environment* env, } -void NewGetAddrInfoReqWrap(const FunctionCallbackInfo& args) { - CHECK(args.IsConstructCall()); -} - - class GetNameInfoReqWrap : public ReqWrap { public: GetNameInfoReqWrap(Environment* env, Local req_wrap_obj); @@ -134,16 +129,6 @@ GetNameInfoReqWrap::GetNameInfoReqWrap(Environment* env, } -void NewGetNameInfoReqWrap(const FunctionCallbackInfo& args) { - CHECK(args.IsConstructCall()); -} - - -void NewQueryReqWrap(const FunctionCallbackInfo& args) { - CHECK(args.IsConstructCall()); -} - - int cmp_ares_tasks(const node_ares_task* a, const node_ares_task* b) { if (a->sock < b->sock) return -1; @@ -1400,8 +1385,12 @@ void Initialize(Local target, target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "AI_V4MAPPED"), Integer::New(env->isolate(), AI_V4MAPPED)); + auto is_construct_call_callback = + [](const FunctionCallbackInfo& args) { + CHECK(args.IsConstructCall()); + }; Local aiw = - FunctionTemplate::New(env->isolate(), NewGetAddrInfoReqWrap); + FunctionTemplate::New(env->isolate(), is_construct_call_callback); aiw->InstanceTemplate()->SetInternalFieldCount(1); aiw->SetClassName( FIXED_ONE_BYTE_STRING(env->isolate(), "GetAddrInfoReqWrap")); @@ -1409,7 +1398,7 @@ void Initialize(Local target, aiw->GetFunction()); Local niw = - FunctionTemplate::New(env->isolate(), NewGetNameInfoReqWrap); + FunctionTemplate::New(env->isolate(), is_construct_call_callback); niw->InstanceTemplate()->SetInternalFieldCount(1); niw->SetClassName( FIXED_ONE_BYTE_STRING(env->isolate(), "GetNameInfoReqWrap")); @@ -1417,7 +1406,7 @@ void Initialize(Local target, niw->GetFunction()); Local qrw = - FunctionTemplate::New(env->isolate(), NewQueryReqWrap); + FunctionTemplate::New(env->isolate(), is_construct_call_callback); qrw->InstanceTemplate()->SetInternalFieldCount(1); qrw->SetClassName( FIXED_ONE_BYTE_STRING(env->isolate(), "QueryReqWrap"));