Skip to content

src: reduce macro usage #29357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 2 commits into from
Closed

src: reduce macro usage #29357

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80c24c7
src: inline `SLICE_START_END()` in node_buffer.cc
addaleax Aug 28, 2019
b00f2db
src: turn `GET_OFFSET()` into an inline function
addaleax Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
src: turn GET_OFFSET() into an inline function 
There’s no need for this to be a macro.
  • Loading branch information
@addaleax
addaleax committed Aug 28, 2019
commit b00f2db42e0446c0af959b8cfc549517648c4112
11 changes: 7 additions & 4 deletions src/node_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ constexpr char kPathSeparator = '/';
const char* const kPathSeparator = "\\/";
#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 GET_TRACE_ENABLED \
(*TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED \
Expand Down Expand Up @@ -1681,7 +1684,7 @@ static void WriteBuffer(const FunctionCallbackInfo<Value>& 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);
Expand Down Expand Up @@ -1721,7 +1724,7 @@ static void WriteBuffers(const FunctionCallbackInfo<Value>& args) {
CHECK(args[1]->IsArray());
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());

Expand Down Expand Up @@ -1765,7 +1768,7 @@ static void WriteString(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsInt32());
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);

Expand Down