Skip to content

Commit

Permalink
src: prefer C++ empty() in boolean expressions
Browse files Browse the repository at this point in the history
PR-URL: #34432
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
  • Loading branch information
tniessen authored and BethGriggs committed Aug 20, 2020
1 parent b00f71b commit 3022e0d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/inspector_agent.cc
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ bool IsFilePath(const std::string& path) {
}
#else
bool IsFilePath(const std::string& path) {
return path.length() && path[0] == '/';
return !path.empty() && path[0] == '/';
}
#endif // __POSIX__

Expand Down
2 changes: 1 addition & 1 deletion src/inspector_js_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ void WaitForDebugger(const FunctionCallbackInfo<Value>& args) {
void Url(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
std::string url = env->inspector_agent()->GetWsUrl();
if (url.length() == 0) {
if (url.empty()) {
return;
}
args.GetReturnValue().Set(OneByteString(env->isolate(), url.c_str()));
Expand Down
2 changes: 1 addition & 1 deletion src/node_file-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void FSContinuationData::MaybeSetFirstPath(const std::string& path) {
}

std::string FSContinuationData::PopPath() {
CHECK_GT(paths_.size(), 0);
CHECK(!paths_.empty());
std::string path = std::move(paths_.back());
paths_.pop_back();
return path;
Expand Down
8 changes: 4 additions & 4 deletions src/node_http2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1510,7 +1510,7 @@ void Http2Session::ClearOutgoing(int status) {

set_sending(false);

if (outgoing_buffers_.size() > 0) {
if (!outgoing_buffers_.empty()) {
outgoing_storage_.clear();
outgoing_length_ = 0;

Expand All @@ -1529,7 +1529,7 @@ void Http2Session::ClearOutgoing(int status) {

// Now that we've finished sending queued data, if there are any pending
// RstStreams we should try sending again and then flush them one by one.
if (pending_rst_streams_.size() > 0) {
if (!pending_rst_streams_.empty()) {
std::vector<int32_t> current_pending_rst_streams;
pending_rst_streams_.swap(current_pending_rst_streams);

Expand Down Expand Up @@ -1588,8 +1588,8 @@ uint8_t Http2Session::SendPendingData() {
ssize_t src_length;
const uint8_t* src;

CHECK_EQ(outgoing_buffers_.size(), 0);
CHECK_EQ(outgoing_storage_.size(), 0);
CHECK(outgoing_buffers_.empty());
CHECK(outgoing_storage_.empty());

// Part One: Gather data from nghttp2

Expand Down
8 changes: 4 additions & 4 deletions src/node_url.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,7 @@ bool ParseHost(const std::string& input,
std::string* output,
bool is_special,
bool unicode = false) {
if (input.length() == 0) {
if (input.empty()) {
output->clear();
return true;
}
Expand Down Expand Up @@ -2036,7 +2036,7 @@ void URL::Parse(const char* input,
(ch == kEOL ||
ch == '?' ||
ch == '#')) {
while (url->path.size() > 1 && url->path[0].length() == 0) {
while (url->path.size() > 1 && url->path[0].empty()) {
url->path.erase(url->path.begin());
}
}
Expand All @@ -2059,9 +2059,9 @@ void URL::Parse(const char* input,
state = kFragment;
break;
default:
if (url->path.size() == 0)
if (url->path.empty())
url->path.emplace_back("");
if (url->path.size() > 0 && ch != kEOL)
else if (ch != kEOL)
AppendOrEscape(&url->path[0], ch, C0_CONTROL_ENCODE_SET);
}
break;
Expand Down
2 changes: 1 addition & 1 deletion src/node_worker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
per_isolate_opts.get(),
kAllowedInEnvironment,
&errors);
if (errors.size() > 0 && args[1]->IsObject()) {
if (!errors.empty() && args[1]->IsObject()) {
// Only fail for explicitly provided env, this protects from failures
// when NODE_OPTIONS from parent's env is used (which is the default).
Local<Value> error;
Expand Down

0 comments on commit 3022e0d

Please sign in to comment.