Skip to content

fs: simplify FSReqBase slightly #19174

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 1 commit into from
Closed

fs: simplify FSReqBase slightly #19174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions src/node_file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ class FSReqBase : public ReqWrap<uv_fs_t> {
encoding_ = encoding;

if (data != nullptr) {
CHECK_EQ(data_, nullptr);
CHECK(!has_data_);
buffer_.AllocateSufficientStorage(len + 1);
buffer_.SetLengthAndZeroTerminate(len);
memcpy(*buffer_, data, len);
data_ = *buffer_;
has_data_ = true;
}
}

Expand All @@ -54,17 +54,19 @@ class FSReqBase : public ReqWrap<uv_fs_t> {
virtual void SetReturnValue(const FunctionCallbackInfo<Value>& args) = 0;

const char* syscall() const { return syscall_; }
const char* data() const { return data_; }
const char* data() const { return has_data_ ? *buffer_ : nullptr; }
enum encoding encoding() const { return encoding_; }

size_t self_size() const override { return sizeof(*this); }

private:
enum encoding encoding_ = UTF8;
bool has_data_ = false;
const char* syscall_ = nullptr;

const char* data_ = nullptr;
MaybeStackBuffer<char> buffer_;
// Typically, the content of buffer_ is something like a file name, so
// something around 64 bytes should be enough.
MaybeStackBuffer<char, 64> buffer_;

DISALLOW_COPY_AND_ASSIGN(FSReqBase);
};
Expand Down