diff options
author | Jon Moss <me@jonathanmoss.me> | 2018-07-25 11:35:10 -0400 |
---|---|---|
committer | Jon Moss <me@jonathanmoss.me> | 2018-08-01 15:07:06 -0400 |
commit | 172b4d7cebaa3ee047dd80ea908f06dd031c39f2 (patch) | |
tree | be6252d954d4aa0f440e20e1a864513aef9a0726 /src | |
parent | 27a5338c8a33a853a0d543cddfa7b2bab1466638 (diff) | |
download | android-node-v8-172b4d7cebaa3ee047dd80ea908f06dd031c39f2.tar.gz android-node-v8-172b4d7cebaa3ee047dd80ea908f06dd031c39f2.tar.bz2 android-node-v8-172b4d7cebaa3ee047dd80ea908f06dd031c39f2.zip |
src,lib: rename FSReqWrap to FSReqCallback
Given that FSReqPromise does not inherit from FSReqWrap, FSReqWrap
should be renamed FSReqCallback to better describe what it does.
First of a few upcoming `fs` refactorings :)
PR-URL: https://github.com/nodejs/node/pull/21971
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/node_file.cc | 20 | ||||
-rw-r--r-- | src/node_file.h | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/node_file.cc b/src/node_file.cc index 16f2506d1f..9303bcc303 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -407,15 +407,15 @@ int FileHandle::DoShutdown(ShutdownWrap* req_wrap) { } -void FSReqWrap::Reject(Local<Value> reject) { +void FSReqCallback::Reject(Local<Value> reject) { MakeCallback(env()->oncomplete_string(), 1, &reject); } -void FSReqWrap::ResolveStat(const uv_stat_t* stat) { +void FSReqCallback::ResolveStat(const uv_stat_t* stat) { Resolve(node::FillGlobalStatsArray(env(), stat, use_bigint())); } -void FSReqWrap::Resolve(Local<Value> value) { +void FSReqCallback::Resolve(Local<Value> value) { Local<Value> argv[2] { Null(env()->isolate()), value @@ -425,14 +425,14 @@ void FSReqWrap::Resolve(Local<Value> value) { argv); } -void FSReqWrap::SetReturnValue(const FunctionCallbackInfo<Value>& args) { +void FSReqCallback::SetReturnValue(const FunctionCallbackInfo<Value>& args) { args.GetReturnValue().SetUndefined(); } -void NewFSReqWrap(const FunctionCallbackInfo<Value>& args) { +void NewFSReqCallback(const FunctionCallbackInfo<Value>& args) { CHECK(args.IsConstructCall()); Environment* env = Environment::GetCurrent(args.GetIsolate()); - new FSReqWrap(env, args.This(), args[0]->IsTrue()); + new FSReqCallback(env, args.This(), args[0]->IsTrue()); } FSReqAfterScope::FSReqAfterScope(FSReqBase* wrap, uv_fs_t* req) @@ -600,7 +600,7 @@ void AfterScanDir(uv_fs_t* req) { // This class is only used on sync fs calls. -// For async calls FSReqWrap is used. +// For async calls FSReqCallback is used. class FSReqWrapSync { public: FSReqWrapSync() {} @@ -1957,13 +1957,13 @@ void Initialize(Local<Object> target, StatWatcher::Initialize(env, target); - // Create FunctionTemplate for FSReqWrap + // Create FunctionTemplate for FSReqCallback Local<FunctionTemplate> fst = - FunctionTemplate::New(env->isolate(), NewFSReqWrap); + FunctionTemplate::New(env->isolate(), NewFSReqCallback); fst->InstanceTemplate()->SetInternalFieldCount(1); AsyncWrap::AddWrapMethods(env, fst); Local<String> wrapString = - FIXED_ONE_BYTE_STRING(env->isolate(), "FSReqWrap"); + FIXED_ONE_BYTE_STRING(env->isolate(), "FSReqCallback"); fst->SetClassName(wrapString); target->Set(context, wrapString, fst->GetFunction()).FromJust(); diff --git a/src/node_file.h b/src/node_file.h index 73202d9c44..049074e111 100644 --- a/src/node_file.h +++ b/src/node_file.h @@ -85,9 +85,9 @@ class FSReqBase : public ReqWrap<uv_fs_t> { DISALLOW_COPY_AND_ASSIGN(FSReqBase); }; -class FSReqWrap : public FSReqBase { +class FSReqCallback : public FSReqBase { public: - FSReqWrap(Environment* env, Local<Object> req, bool use_bigint) + FSReqCallback(Environment* env, Local<Object> req, bool use_bigint) : FSReqBase(env, req, AsyncWrap::PROVIDER_FSREQWRAP, use_bigint) { } void Reject(Local<Value> reject) override; @@ -99,10 +99,10 @@ class FSReqWrap : public FSReqBase { tracker->TrackThis(this); } - ADD_MEMORY_INFO_NAME(FSReqWrap) + ADD_MEMORY_INFO_NAME(FSReqCallback) private: - DISALLOW_COPY_AND_ASSIGN(FSReqWrap); + DISALLOW_COPY_AND_ASSIGN(FSReqCallback); }; template <typename NativeT = double, typename V8T = v8::Float64Array> |