1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: turn GET_OFFSET() into an inline function

Browse Source 
There’s no need for this to be a macro.

PR-URL: https://github.com/nodejs/node/pull/29357
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Masashi Hirano <shisama07@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
This commit is contained in:
Anna Henningsen 2019-08-28 14:37:18 +02:00 committed by Daniel Bevenius
parent 5a52bdad9b
commit 0f3aa81eab
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node_file.cc
View File

@ -88,7 +88,10 @@ constexpr char kPathSeparator = '/';
const char* const kPathSeparator = "\\/"; const char* const kPathSeparator = "\\/";
#endif #endif
#define GET_OFFSET(a) (IsSafeJsInt(a) ? (a).As<Integer>()->Value() : -1) inline int64_t GetOffset(Local<Value> value) {
return IsSafeJsInt(value) ? value.As<Integer>()->Value() : -1;
}
#define TRACE_NAME(name) "fs.sync." #name #define TRACE_NAME(name) "fs.sync." #name
#define GET_TRACE_ENABLED \ #define GET_TRACE_ENABLED \
(*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED \ (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED \
@ -1681,7 +1684,7 @@ static void WriteBuffer(const FunctionCallbackInfo<Value>& args) {
CHECK_LE(len, buffer_length); CHECK_LE(len, buffer_length);
CHECK_GE(off + len, off); CHECK_GE(off + len, off);
const int64_t pos = GET_OFFSET(args[4]); const int64_t pos = GetOffset(args[4]);
char* buf = buffer_data + off; char* buf = buffer_data + off;
uv_buf_t uvbuf = uv_buf_init(buf, len); uv_buf_t uvbuf = uv_buf_init(buf, len);
@ -1721,7 +1724,7 @@ static void WriteBuffers(const FunctionCallbackInfo<Value>& args) {
CHECK(args[1]->IsArray()); CHECK(args[1]->IsArray());
Local<Array> chunks = args[1].As<Array>(); Local<Array> chunks = args[1].As<Array>();
int64_t pos = GET_OFFSET(args[2]); int64_t pos = GetOffset(args[2]);
MaybeStackBuffer<uv_buf_t> iovs(chunks->Length()); MaybeStackBuffer<uv_buf_t> iovs(chunks->Length());
@ -1765,7 +1768,7 @@ static void WriteString(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsInt32()); CHECK(args[0]->IsInt32());
const int fd = args[0].As<Int32>()->Value(); const int fd = args[0].As<Int32>()->Value();
const int64_t pos = GET_OFFSET(args[2]); const int64_t pos = GetOffset(args[2]);
const auto enc = ParseEncoding(isolate, args[3], UTF8); const auto enc = ParseEncoding(isolate, args[3], UTF8);