From b1dcaadb0e013daee866995c6be48841dbcf4af3 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Mon, 3 Nov 2014 13:19:17 +0100 Subject: [PATCH] src: replace NULL with nullptr in debug agent Update the debug agent to conform to the code style in src/. --- src/debug-agent.cc | 22 +++++++++++----------- src/debug-agent.h | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/debug-agent.cc b/src/debug-agent.cc index 78362afe96a86c..955adc6255bef6 100644 --- a/src/debug-agent.cc +++ b/src/debug-agent.cc @@ -55,8 +55,8 @@ Agent::Agent(Environment* env) : state_(kNone), port_(5858), wait_(false), parent_env_(env), - child_env_(NULL), - dispatch_handler_(NULL) { + child_env_(nullptr), + dispatch_handler_(nullptr) { int err; err = uv_sem_init(&start_sem_, 0); @@ -117,7 +117,7 @@ bool Agent::Start(int port, bool wait) { return true; thread_create_failed: - uv_close(reinterpret_cast(&child_signal_), NULL); + uv_close(reinterpret_cast(&child_signal_), nullptr); async_init_failed: err = uv_loop_close(&child_loop_); @@ -144,10 +144,10 @@ void Agent::Stop() { return; } - v8::Debug::SetMessageHandler(NULL); + v8::Debug::SetMessageHandler(nullptr); // Send empty message to terminate things - EnqueueMessage(new AgentMessage(NULL, 0)); + EnqueueMessage(new AgentMessage(nullptr, 0)); // Signal worker thread to make it stop err = uv_async_send(&child_signal_); @@ -156,7 +156,7 @@ void Agent::Stop() { err = uv_thread_join(&thread_); CHECK_EQ(err, 0); - uv_close(reinterpret_cast(&child_signal_), NULL); + uv_close(reinterpret_cast(&child_signal_), nullptr); uv_run(&child_loop_, UV_RUN_NOWAIT); err = uv_loop_close(&child_loop_); @@ -202,7 +202,7 @@ void Agent::WorkerRun() { env->CleanupHandles(); env->Dispose(); - env = NULL; + env = nullptr; } isolate->Dispose(); } @@ -263,7 +263,7 @@ void Agent::SendCommand(const FunctionCallbackInfo& args) { String::Value v(args[0]); v8::Debug::SendCommand(a->parent_env()->isolate(), *v, v.length()); - if (a->dispatch_handler_ != NULL) + if (a->dispatch_handler_ != nullptr) a->dispatch_handler_(a->parent_env()); } @@ -286,11 +286,11 @@ void Agent::ChildSignalCb(uv_async_t* signal) { AgentMessage* msg = ContainerOf(&AgentMessage::member, q); // Time to close everything - if (msg->data() == NULL) { + if (msg->data() == nullptr) { QUEUE_REMOVE(q); delete msg; - MakeCallback(isolate, api, "onclose", 0, NULL); + MakeCallback(isolate, api, "onclose", 0, nullptr); break; } @@ -331,7 +331,7 @@ void Agent::MessageHandler(const v8::Debug::Message& message) { Isolate* isolate = message.GetIsolate(); Environment* env = Environment::GetCurrent(isolate); Agent* a = env->debugger_agent(); - CHECK_NE(a, NULL); + CHECK_NE(a, nullptr); CHECK_EQ(isolate, a->parent_env()->isolate()); HandleScope scope(isolate); diff --git a/src/debug-agent.h b/src/debug-agent.h index d3c7fcc382db19..616fa9ff0d49bd 100644 --- a/src/debug-agent.h +++ b/src/debug-agent.h @@ -108,7 +108,7 @@ class Agent { class AgentMessage { public: AgentMessage(uint16_t* val, int length) : length_(length) { - if (val == NULL) { + if (val == nullptr) { data_ = val; } else { data_ = new uint16_t[length]; @@ -118,7 +118,7 @@ class AgentMessage { ~AgentMessage() { delete[] data_; - data_ = NULL; + data_ = nullptr; } inline const uint16_t* data() const { return data_; }