summaryrefslogtreecommitdiff
path: root/deps/v8/src/d8-posix.cc
diff options
context:
space:
mode:
Diffstat (limited to 'deps/v8/src/d8-posix.cc')
-rw-r--r--deps/v8/src/d8-posix.cc49
1 files changed, 23 insertions, 26 deletions
diff --git a/deps/v8/src/d8-posix.cc b/deps/v8/src/d8-posix.cc
index 18040c81f1..8836fdb0e5 100644
--- a/deps/v8/src/d8-posix.cc
+++ b/deps/v8/src/d8-posix.cc
@@ -87,7 +87,7 @@ static bool WaitOnFD(int fd,
int gone = 0;
if (total_timeout != -1) {
struct timeval time_now;
- gettimeofday(&time_now, NULL);
+ gettimeofday(&time_now, nullptr);
time_t seconds = time_now.tv_sec - start_time.tv_sec;
gone = static_cast<int>(seconds * 1000 +
(time_now.tv_usec - start_time.tv_usec) / 1000);
@@ -104,11 +104,8 @@ static bool WaitOnFD(int fd,
}
timeout.tv_usec = (read_timeout % 1000) * 1000;
timeout.tv_sec = read_timeout / 1000;
- int number_of_fds_ready = select(fd + 1,
- &readfds,
- &writefds,
- &exceptfds,
- read_timeout != -1 ? &timeout : NULL);
+ int number_of_fds_ready = select(fd + 1, &readfds, &writefds, &exceptfds,
+ read_timeout != -1 ? &timeout : nullptr);
return number_of_fds_ready == 1;
}
@@ -118,7 +115,7 @@ static bool WaitOnFD(int fd,
static bool TimeIsOut(const struct timeval& start_time, const int& total_time) {
if (total_time == -1) return false;
struct timeval time_now;
- gettimeofday(&time_now, NULL);
+ gettimeofday(&time_now, nullptr);
// Careful about overflow.
int seconds = static_cast<int>(time_now.tv_sec - start_time.tv_sec);
if (seconds > 100) {
@@ -139,7 +136,9 @@ static bool TimeIsOut(const struct timeval& start_time, const int& total_time) {
class ZombieProtector {
public:
explicit ZombieProtector(int pid): pid_(pid) { }
- ~ZombieProtector() { if (pid_ != 0) waitpid(pid_, NULL, 0); }
+ ~ZombieProtector() {
+ if (pid_ != 0) waitpid(pid_, nullptr, 0);
+ }
void ChildIsDeadNow() { pid_ = 0; }
private:
int pid_;
@@ -161,12 +160,10 @@ class OpenFDCloser {
// scope.
class ExecArgs {
public:
- ExecArgs() {
- exec_args_[0] = NULL;
- }
+ ExecArgs() { exec_args_[0] = nullptr; }
bool Init(Isolate* isolate, Local<Value> arg0, Local<Array> command_args) {
String::Utf8Value prog(isolate, arg0);
- if (*prog == NULL) {
+ if (*prog == nullptr) {
const char* message =
"os.system(): String conversion of program name failed";
isolate->ThrowException(
@@ -184,8 +181,8 @@ class ExecArgs {
command_args->Get(isolate->GetCurrentContext(),
Integer::New(isolate, j)).ToLocalChecked());
String::Utf8Value utf8_arg(isolate, arg);
- if (*utf8_arg == NULL) {
- exec_args_[i] = NULL; // Consistent state for destructor.
+ if (*utf8_arg == nullptr) {
+ exec_args_[i] = nullptr; // Consistent state for destructor.
const char* message =
"os.system(): String conversion of argument failed.";
isolate->ThrowException(
@@ -198,12 +195,12 @@ class ExecArgs {
snprintf(c_arg, len, "%s", *utf8_arg);
exec_args_[i] = c_arg;
}
- exec_args_[i] = NULL;
+ exec_args_[i] = nullptr;
return true;
}
~ExecArgs() {
for (unsigned i = 0; i < kMaxArgs; i++) {
- if (exec_args_[i] == NULL) {
+ if (exec_args_[i] == nullptr) {
return;
}
delete [] exec_args_[i];
@@ -490,7 +487,7 @@ void Shell::System(const v8::FunctionCallbackInfo<v8::Value>& args) {
}
struct timeval start_time;
- gettimeofday(&start_time, NULL);
+ gettimeofday(&start_time, nullptr);
ExecArgs exec_args;
if (!exec_args.Init(args.GetIsolate(), args[0], command_args)) {
@@ -554,7 +551,7 @@ void Shell::ChangeDirectory(const v8::FunctionCallbackInfo<v8::Value>& args) {
return;
}
String::Utf8Value directory(args.GetIsolate(), args[0]);
- if (*directory == NULL) {
+ if (*directory == nullptr) {
const char* message = "os.chdir(): String conversion of argument failed.";
args.GetIsolate()->ThrowException(
String::NewFromUtf8(args.GetIsolate(), message, NewStringType::kNormal)
@@ -619,7 +616,7 @@ static bool mkdirp(Isolate* isolate, char* directory, mode_t mask) {
return CheckItsADirectory(isolate, directory);
} else if (errno == ENOENT) { // Intermediate path element is missing.
char* last_slash = strrchr(directory, '/');
- if (last_slash == NULL) {
+ if (last_slash == nullptr) {
isolate->ThrowException(
String::NewFromUtf8(isolate, strerror(errno), NewStringType::kNormal)
.ToLocalChecked());
@@ -668,7 +665,7 @@ void Shell::MakeDirectory(const v8::FunctionCallbackInfo<v8::Value>& args) {
return;
}
String::Utf8Value directory(args.GetIsolate(), args[0]);
- if (*directory == NULL) {
+ if (*directory == nullptr) {
const char* message = "os.mkdirp(): String conversion of argument failed.";
args.GetIsolate()->ThrowException(
String::NewFromUtf8(args.GetIsolate(), message, NewStringType::kNormal)
@@ -688,7 +685,7 @@ void Shell::RemoveDirectory(const v8::FunctionCallbackInfo<v8::Value>& args) {
return;
}
String::Utf8Value directory(args.GetIsolate(), args[0]);
- if (*directory == NULL) {
+ if (*directory == nullptr) {
const char* message = "os.rmdir(): String conversion of argument failed.";
args.GetIsolate()->ThrowException(
String::NewFromUtf8(args.GetIsolate(), message, NewStringType::kNormal)
@@ -709,7 +706,7 @@ void Shell::SetEnvironment(const v8::FunctionCallbackInfo<v8::Value>& args) {
}
String::Utf8Value var(args.GetIsolate(), args[0]);
String::Utf8Value value(args.GetIsolate(), args[1]);
- if (*var == NULL) {
+ if (*var == nullptr) {
const char* message =
"os.setenv(): String conversion of variable name failed.";
args.GetIsolate()->ThrowException(
@@ -717,7 +714,7 @@ void Shell::SetEnvironment(const v8::FunctionCallbackInfo<v8::Value>& args) {
.ToLocalChecked());
return;
}
- if (*value == NULL) {
+ if (*value == nullptr) {
const char* message =
"os.setenv(): String conversion of variable contents failed.";
args.GetIsolate()->ThrowException(
@@ -738,7 +735,7 @@ void Shell::UnsetEnvironment(const v8::FunctionCallbackInfo<v8::Value>& args) {
return;
}
String::Utf8Value var(args.GetIsolate(), args[0]);
- if (*var == NULL) {
+ if (*var == nullptr) {
const char* message =
"os.setenv(): String conversion of variable name failed.";
args.GetIsolate()->ThrowException(
@@ -825,7 +822,7 @@ char* Shell::ReadCharsFromTcpPort(const char* name, int* size_out) {
fprintf(stderr, "Received length %d for %s from localhost:%d\n",
file_length, name, Shell::options.read_from_tcp_port);
close(sockfd);
- return NULL;
+ return nullptr;
}
// Allocate the output array.
@@ -841,7 +838,7 @@ char* Shell::ReadCharsFromTcpPort(const char* name, int* size_out) {
Shell::options.read_from_tcp_port);
close(sockfd);
delete[] chars;
- return NULL;
+ return nullptr;
}
total_received += received;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-11 17:35:12 +0000