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

Unified Diff: webrtc/examples/peerconnection/server/peer_channel.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. 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
Index: webrtc/examples/peerconnection/server/peer_channel.cc
diff --git a/webrtc/examples/peerconnection/server/peer_channel.cc b/webrtc/examples/peerconnection/server/peer_channel.cc
index 35d592eb7681cd3373a859acf25ab621cd0cc856..3b5b86bea83578eee8b9d1c49953fee051c9b779 100644
--- a/webrtc/examples/peerconnection/server/peer_channel.cc
+++ b/webrtc/examples/peerconnection/server/peer_channel.cc
@@ -55,8 +55,10 @@ const size_t kMaxNameLength = 512;
int ChannelMember::s_member_id_ = 0;
ChannelMember::ChannelMember(DataSocket* socket)
- : waiting_socket_(NULL), id_(++s_member_id_),
- connected_(true), timestamp_(time(NULL)) {
+ : waiting_socket_(nullptr),
+ id_(++s_member_id_),
+ connected_(true),
+ timestamp_(time(nullptr)) {
assert(socket);
assert(socket->method() == DataSocket::GET);
assert(socket->PathEquals("/sign_in"));
@@ -77,7 +79,7 @@ bool ChannelMember::is_wait_request(DataSocket* ds) const {
}
bool ChannelMember::TimedOut() {
- return waiting_socket_ == NULL && (time(NULL) - timestamp_) > 30;
+ return waiting_socket_ == nullptr && (time(nullptr) - timestamp_) > 30;
}
std::string ChannelMember::GetPeerIdHeader() const {
@@ -123,8 +125,8 @@ void ChannelMember::ForwardRequestToPeer(DataSocket* ds, ChannelMember* peer) {
void ChannelMember::OnClosing(DataSocket* ds) {
if (ds == waiting_socket_) {
- waiting_socket_ = NULL;
- timestamp_ = time(NULL);
+ waiting_socket_ = nullptr;
+ timestamp_ = time(nullptr);
}
}
@@ -140,8 +142,8 @@ void ChannelMember::QueueResponse(const std::string& status,
if (!ok) {
printf("Failed to deliver data to waiting socket\n");
}
- waiting_socket_ = NULL;
- timestamp_ = time(NULL);
+ waiting_socket_ = nullptr;
+ timestamp_ = time(nullptr);
} else {
QueuedResponse qr;
qr.status = status;
@@ -155,7 +157,7 @@ void ChannelMember::QueueResponse(const std::string& status,
void ChannelMember::SetWaitingSocket(DataSocket* ds) {
assert(ds->method() == DataSocket::GET);
if (ds && !queue_.empty()) {
- assert(waiting_socket_ == NULL);
+ assert(waiting_socket_ == nullptr);
const QueuedResponse& response = queue_.front();
ds->Send(response.status, true, response.content_type,
response.extra_headers, response.data);
@@ -180,7 +182,7 @@ ChannelMember* PeerChannel::Lookup(DataSocket* ds) const {
assert(ds);
if (ds->method() != DataSocket::GET && ds->method() != DataSocket::POST)
- return NULL;
+ return nullptr;
size_t i = 0;
for (; i < ARRAYSIZE(kRequestPaths); ++i) {
@@ -189,13 +191,13 @@ ChannelMember* PeerChannel::Lookup(DataSocket* ds) const {
}
if (i == ARRAYSIZE(kRequestPaths))
- return NULL;
+ return nullptr;
std::string args(ds->request_arguments());
static const char kPeerId[] = "peer_id=";
size_t found = args.find(kPeerId);
if (found == std::string::npos)
- return NULL;
+ return nullptr;
int id = atoi(&args[found + ARRAYSIZE(kPeerId) - 1]);
Members::const_iterator iter = members_.begin();
@@ -209,7 +211,7 @@ ChannelMember* PeerChannel::Lookup(DataSocket* ds) const {
}
}
- return NULL;
+ return nullptr;
}
ChannelMember* PeerChannel::IsTargetedRequest(const DataSocket* ds) const {
@@ -219,13 +221,13 @@ ChannelMember* PeerChannel::IsTargetedRequest(const DataSocket* ds) const {
const std::string& path = ds->request_path();
size_t args = path.find('?');
if (args == std::string::npos)
- return NULL;
+ return nullptr;
size_t found;
const char kTargetPeerIdParam[] = "to=";
do {
found = path.find(kTargetPeerIdParam, args);
if (found == std::string::npos)
- return NULL;
+ return nullptr;
if (found == (args + 1) || path[found - 1] == '&') {
found += ARRAYSIZE(kTargetPeerIdParam) - 1;
break;
@@ -239,7 +241,7 @@ ChannelMember* PeerChannel::IsTargetedRequest(const DataSocket* ds) const {
return *i;
}
}
- return NULL;
+ return nullptr;
}
bool PeerChannel::AddMember(DataSocket* ds) {

Powered by Google App Engine
This is Rietveld 408576698