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

Unified Diff: net/quic/quic_session.cc

Issue 612323013: QUIC - (no behavior change) s/NULL/nullptr/g in .../quic/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « net/quic/quic_session.h ('k') | net/quic/quic_session_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_session.cc
diff --git a/net/quic/quic_session.cc b/net/quic/quic_session.cc
index 8d82662fc1a2c5a7f1e25fa463032094fda4f4e2..cef56567247030f2423f8823af9c39ef3c813a13 100644
--- a/net/quic/quic_session.cc
+++ b/net/quic/quic_session.cc
@@ -337,7 +337,7 @@ void QuicSession::OnCanWrite() {
has_pending_handshake_ = false; // We just popped it.
}
ReliableQuicStream* stream = GetStream(stream_id);
- if (stream != NULL && !stream->flow_controller()->IsBlocked()) {
+ if (stream != nullptr && !stream->flow_controller()->IsBlocked()) {
// If the stream can't write all bytes, it'll re-add itself to the blocked
// list.
stream->OnCanWrite();
@@ -621,11 +621,11 @@ ReliableQuicStream* QuicSession::GetStream(const QuicStreamId stream_id) {
QuicDataStream* QuicSession::GetDataStream(const QuicStreamId stream_id) {
if (stream_id == kCryptoStreamId) {
DLOG(FATAL) << "Attempt to call GetDataStream with the crypto stream id";
- return NULL;
+ return nullptr;
}
if (stream_id == kHeadersStreamId) {
DLOG(FATAL) << "Attempt to call GetDataStream with the headers stream id";
- return NULL;
+ return nullptr;
}
DataStreamMap::iterator it = stream_map_.find(stream_id);
@@ -634,7 +634,7 @@ QuicDataStream* QuicSession::GetDataStream(const QuicStreamId stream_id) {
}
if (IsClosedStream(stream_id)) {
- return NULL;
+ return nullptr;
}
if (stream_id % 2 == next_stream_id_ % 2) {
@@ -643,7 +643,7 @@ QuicDataStream* QuicSession::GetDataStream(const QuicStreamId stream_id) {
if (connection()->connected()) {
connection()->SendConnectionClose(QUIC_PACKET_FOR_NONEXISTENT_STREAM);
}
- return NULL;
+ return nullptr;
}
return GetIncomingDataStream(stream_id);
@@ -651,7 +651,7 @@ QuicDataStream* QuicSession::GetDataStream(const QuicStreamId stream_id) {
QuicDataStream* QuicSession::GetIncomingDataStream(QuicStreamId stream_id) {
if (IsClosedStream(stream_id)) {
- return NULL;
+ return nullptr;
}
implicitly_created_streams_.erase(stream_id);
@@ -666,7 +666,7 @@ QuicDataStream* QuicSession::GetIncomingDataStream(QuicStreamId stream_id) {
<< ", max delta: " << kMaxStreamIdDelta;
connection()->SendConnectionClose(QUIC_INVALID_STREAM_ID);
}
- return NULL;
+ return nullptr;
}
if (largest_peer_created_stream_id_ == 0) {
if (is_server()) {
@@ -683,8 +683,8 @@ QuicDataStream* QuicSession::GetIncomingDataStream(QuicStreamId stream_id) {
largest_peer_created_stream_id_ = stream_id;
}
QuicDataStream* stream = CreateIncomingDataStream(stream_id);
- if (stream == NULL) {
- return NULL;
+ if (stream == nullptr) {
+ return nullptr;
}
ActivateStream(stream);
return stream;
@@ -725,7 +725,7 @@ size_t QuicSession::GetNumOpenStreams() const {
void QuicSession::MarkWriteBlocked(QuicStreamId id, QuicPriority priority) {
#ifndef NDEBUG
ReliableQuicStream* stream = GetStream(id);
- if (stream != NULL) {
+ if (stream != nullptr) {
LOG_IF(DFATAL, priority != stream->EffectivePriority())
<< ENDPOINT << "Stream " << id
<< "Priorities do not match. Got: " << priority
« no previous file with comments | « net/quic/quic_session.h ('k') | net/quic/quic_session_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698