Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: webrtc/base/physicalsocketserver.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/pathutils.cc ('k') | webrtc/base/physicalsocketserver_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/physicalsocketserver.cc
diff --git a/webrtc/base/physicalsocketserver.cc b/webrtc/base/physicalsocketserver.cc
index 5b49638bd658feeac2f770ff6a26c913c9f9a849..0d6cfa14f7206d314ff581489836f74f7b678277 100644
--- a/webrtc/base/physicalsocketserver.cc
+++ b/webrtc/base/physicalsocketserver.cc
@@ -1118,15 +1118,15 @@ class EventDispatcher : public Dispatcher {
}
~EventDispatcher() {
- if (hev_ != NULL) {
+ if (hev_ != nullptr) {
ss_->Remove(this);
WSACloseEvent(hev_);
- hev_ = NULL;
+ hev_ = nullptr;
}
}
virtual void Signal() {
- if (hev_ != NULL)
+ if (hev_ != nullptr)
WSASetEvent(hev_);
}
@@ -1268,7 +1268,7 @@ void PhysicalSocketServer::Remove(Dispatcher *pdispatcher) {
bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) {
// Calculate timing information
- struct timeval *ptvWait = NULL;
+ struct timeval* ptvWait = nullptr;
struct timeval tvWait;
struct timeval tvStop;
if (cmsWait != kForever) {
@@ -1278,7 +1278,7 @@ bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) {
ptvWait = &tvWait;
// Calculate when to return in a timeval
- gettimeofday(&tvStop, NULL);
+ gettimeofday(&tvStop, nullptr);
tvStop.tv_sec += tvWait.tv_sec;
tvStop.tv_usec += tvWait.tv_usec;
if (tvStop.tv_usec >= 1000000) {
@@ -1330,7 +1330,7 @@ bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) {
// < 0 means error
// 0 means timeout
// > 0 means count of descriptors ready
- int n = select(fdmax + 1, &fdsRead, &fdsWrite, NULL, ptvWait);
+ int n = select(fdmax + 1, &fdsRead, &fdsWrite, nullptr, ptvWait);
// If error, return error.
if (n < 0) {
@@ -1405,7 +1405,7 @@ bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) {
ptvWait->tv_sec = 0;
ptvWait->tv_usec = 0;
struct timeval tvT;
- gettimeofday(&tvT, NULL);
+ gettimeofday(&tvT, nullptr);
if ((tvStop.tv_sec > tvT.tv_sec)
|| ((tvStop.tv_sec == tvT.tv_sec)
&& (tvStop.tv_usec > tvT.tv_usec))) {
@@ -1473,7 +1473,7 @@ bool PhysicalSocketServer::InstallSignal(int signum, void (*handler)(int)) {
#else
act.sa_flags = 0;
#endif
- if (sigaction(signum, &act, NULL) != 0) {
+ if (sigaction(signum, &act, nullptr) != 0) {
LOG_ERR(LS_ERROR) << "Couldn't set sigaction";
return false;
}
« no previous file with comments | « webrtc/base/pathutils.cc ('k') | webrtc/base/physicalsocketserver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698