From 0f3aa81eab383ab85b5b84d6fe4570115d824a64 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 28 Aug 2019 14:37:18 +0200 Subject: src: turn `GET_OFFSET()` into an inline function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There’s no need for this to be a macro. PR-URL: https://github.com/nodejs/node/pull/29357 Reviewed-By: Jiawen Geng Reviewed-By: Masashi Hirano Reviewed-By: Colin Ihrig Reviewed-By: Luigi Pinca Reviewed-By: James M Snell Reviewed-By: Richard Lau Reviewed-By: Michael Dawson --- src/node_file.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/node_file.cc') diff --git a/src/node_file.cc b/src/node_file.cc index c4e3b83392..ae2aa0677f 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -88,7 +88,10 @@ constexpr char kPathSeparator = '/'; const char* const kPathSeparator = "\\/"; #endif -#define GET_OFFSET(a) (IsSafeJsInt(a) ? (a).As()->Value() : -1) +inline int64_t GetOffset(Local value) { + return IsSafeJsInt(value) ? value.As()->Value() : -1; +} + #define TRACE_NAME(name) "fs.sync." #name #define GET_TRACE_ENABLED \ (*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED \ @@ -1681,7 +1684,7 @@ static void WriteBuffer(const FunctionCallbackInfo& args) { CHECK_LE(len, buffer_length); 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; uv_buf_t uvbuf = uv_buf_init(buf, len); @@ -1721,7 +1724,7 @@ static void WriteBuffers(const FunctionCallbackInfo& args) { CHECK(args[1]->IsArray()); Local chunks = args[1].As(); - int64_t pos = GET_OFFSET(args[2]); + int64_t pos = GetOffset(args[2]); MaybeStackBuffer iovs(chunks->Length()); @@ -1765,7 +1768,7 @@ static void WriteString(const FunctionCallbackInfo& args) { CHECK(args[0]->IsInt32()); const int fd = args[0].As()->Value(); - const int64_t pos = GET_OFFSET(args[2]); + const int64_t pos = GetOffset(args[2]); const auto enc = ParseEncoding(isolate, args[3], UTF8); -- cgit v1.2.3