Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTobias Nießen <tniessen@tnie.de>2020-07-20 00:14:56 +0300
committerJames M Snell <jasnell@gmail.com>2020-08-11 23:22:04 +0300
commit1be7bbdc3b533759072cfc3d13766511197e3d01 (patch)
tree1428a01ca9e82cc939fc64e687ce51c4751aa044 /src
parentf280d2c85cf5bcf2cbe277de5a1f410a68c7a562 (diff)
src: prefer C++ empty() in boolean expressions
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'src')
-rw-r--r--src/inspector_agent.cc2
-rw-r--r--src/inspector_js_api.cc2
-rw-r--r--src/node_file-inl.h2
-rw-r--r--src/node_http2.cc8
-rw-r--r--src/node_url.cc8
-rw-r--r--src/node_worker.cc2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
index f81c16e91ab..4b7997a02fd 100644
--- a/src/inspector_agent.cc
+++ b/src/inspector_agent.cc
@@ -366,7 +366,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__
diff --git a/src/inspector_js_api.cc b/src/inspector_js_api.cc
index 12569e97918..131d8d74b98 100644
--- a/src/inspector_js_api.cc
+++ b/src/inspector_js_api.cc
@@ -303,7 +303,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()));
diff --git a/src/node_file-inl.h b/src/node_file-inl.h
index 2ad8c73f05e..0188261b7dc 100644
--- a/src/node_file-inl.h
+++ b/src/node_file-inl.h
@@ -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;
diff --git a/src/node_http2.cc b/src/node_http2.cc
index 670fa4802a4..7b0e4e8af20 100644
--- a/src/node_http2.cc
+++ b/src/node_http2.cc
@@ -1517,7 +1517,7 @@ void Http2Session::ClearOutgoing(int status) {
set_sending(false);
- if (outgoing_buffers_.size() > 0) {
+ if (!outgoing_buffers_.empty()) {
outgoing_storage_.clear();
outgoing_length_ = 0;
@@ -1536,7 +1536,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);
@@ -1595,8 +1595,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
diff --git a/src/node_url.cc b/src/node_url.cc
index efab1060f88..bd4932c0ab0 100644
--- a/src/node_url.cc
+++ b/src/node_url.cc
@@ -1170,7 +1170,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;
}
@@ -2037,7 +2037,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());
}
}
@@ -2060,9 +2060,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;
diff --git a/src/node_worker.cc b/src/node_worker.cc
index 803fea03de0..2b7cc156db9 100644
--- a/src/node_worker.cc
+++ b/src/node_worker.cc
@@ -497,7 +497,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;