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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_framer.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_framer.h ('k') | net/quic/quic_framer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_framer.cc
diff --git a/net/quic/quic_framer.cc b/net/quic/quic_framer.cc
index 719c47ed35e7336f4bb878c3b9f887b45110675a..83c44c00478471fa574894a160c18d8cddd4186c 100644
--- a/net/quic/quic_framer.cc
+++ b/net/quic/quic_framer.cc
@@ -146,9 +146,9 @@ bool QuicFramerVisitorInterface::OnBlockedFrame(const QuicBlockedFrame& frame) {
QuicFramer::QuicFramer(const QuicVersionVector& supported_versions,
QuicTime creation_time,
bool is_server)
- : visitor_(NULL),
- fec_builder_(NULL),
- entropy_calculator_(NULL),
+ : visitor_(nullptr),
+ fec_builder_(nullptr),
+ entropy_calculator_(nullptr),
error_(QUIC_NO_ERROR),
last_sequence_number_(0),
last_serialized_connection_id_(0),
@@ -322,8 +322,8 @@ SerializedPacket QuicFramer::BuildDataPacket(
const QuicFrames& frames,
size_t packet_size) {
QuicDataWriter writer(packet_size);
- const SerializedPacket kNoPacket(
- 0, PACKET_1BYTE_SEQUENCE_NUMBER, NULL, 0, NULL);
+ const SerializedPacket kNoPacket(0, PACKET_1BYTE_SEQUENCE_NUMBER, nullptr, 0,
+ nullptr);
if (!AppendPacketHeader(header, &writer)) {
LOG(DFATAL) << "AppendPacketHeader failed";
return kNoPacket;
@@ -431,7 +431,7 @@ SerializedPacket QuicFramer::BuildDataPacket(
return SerializedPacket(header.packet_sequence_number,
header.public_header.sequence_number_length, packet,
- GetPacketEntropyHash(header), NULL);
+ GetPacketEntropyHash(header), nullptr);
}
SerializedPacket QuicFramer::BuildFecPacket(const QuicPacketHeader& header,
@@ -442,8 +442,8 @@ SerializedPacket QuicFramer::BuildFecPacket(const QuicPacketHeader& header,
len += fec.redundancy.length();
QuicDataWriter writer(len);
- const SerializedPacket kNoPacket(
- 0, PACKET_1BYTE_SEQUENCE_NUMBER, NULL, 0, NULL);
+ const SerializedPacket kNoPacket(0, PACKET_1BYTE_SEQUENCE_NUMBER, nullptr, 0,
+ nullptr);
if (!AppendPacketHeader(header, &writer)) {
LOG(DFATAL) << "AppendPacketHeader failed";
return kNoPacket;
@@ -461,7 +461,7 @@ SerializedPacket QuicFramer::BuildFecPacket(const QuicPacketHeader& header,
header.public_header.connection_id_length,
header.public_header.version_flag,
header.public_header.sequence_number_length),
- GetPacketEntropyHash(header), NULL);
+ GetPacketEntropyHash(header), nullptr);
}
// static
@@ -478,7 +478,7 @@ QuicEncryptedPacket* QuicFramer::BuildPublicResetPacket(
QuicSocketAddressCoder address_coder(packet.client_address);
string serialized_address = address_coder.Encode();
if (serialized_address.empty()) {
- return NULL;
+ return nullptr;
}
reset.SetStringPiece(kCADR, serialized_address);
}
@@ -491,15 +491,15 @@ QuicEncryptedPacket* QuicFramer::BuildPublicResetPacket(
uint8 flags = static_cast<uint8>(PACKET_PUBLIC_FLAGS_RST |
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID);
if (!writer.WriteUInt8(flags)) {
- return NULL;
+ return nullptr;
}
if (!writer.WriteUInt64(packet.public_header.connection_id)) {
- return NULL;
+ return nullptr;
}
if (!writer.WriteBytes(reset_serialized.data(), reset_serialized.length())) {
- return NULL;
+ return nullptr;
}
return new QuicEncryptedPacket(writer.take(), len, true);
@@ -515,16 +515,16 @@ QuicEncryptedPacket* QuicFramer::BuildVersionNegotiationPacket(
uint8 flags = static_cast<uint8>(PACKET_PUBLIC_FLAGS_VERSION |
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID);
if (!writer.WriteUInt8(flags)) {
- return NULL;
+ return nullptr;
}
if (!writer.WriteUInt64(header.connection_id)) {
- return NULL;
+ return nullptr;
}
for (size_t i = 0; i < supported_versions.size(); ++i) {
if (!writer.WriteUInt32(QuicVersionToQuicTag(supported_versions[i]))) {
- return NULL;
+ return nullptr;
}
}
@@ -547,14 +547,14 @@ bool QuicFramer::ProcessPacket(const QuicEncryptedPacket& packet) {
if (!visitor_->OnUnauthenticatedPublicHeader(public_header)) {
// The visitor suppresses further processing of the packet.
- reader_.reset(NULL);
+ reader_.reset(nullptr);
return true;
}
if (is_server_ && public_header.version_flag &&
public_header.versions[0] != quic_version_) {
if (!visitor_->OnProtocolVersionMismatch(public_header.versions[0])) {
- reader_.reset(NULL);
+ reader_.reset(nullptr);
return true;
}
}
@@ -568,7 +568,7 @@ bool QuicFramer::ProcessPacket(const QuicEncryptedPacket& packet) {
rv = ProcessDataPacket(public_header, packet);
}
- reader_.reset(NULL);
+ reader_.reset(nullptr);
return rv;
}
@@ -695,7 +695,7 @@ bool QuicFramer::ProcessRevivedPacket(QuicPacketHeader* header,
}
visitor_->OnPacketComplete();
- reader_.reset(NULL);
+ reader_.reset(nullptr);
return true;
}
@@ -1639,7 +1639,7 @@ StringPiece QuicFramer::GetAssociatedDataFromEncryptedPacket(
void QuicFramer::SetDecrypter(QuicDecrypter* decrypter,
EncryptionLevel level) {
- DCHECK(alternative_decrypter_.get() == NULL);
+ DCHECK(alternative_decrypter_.get() == nullptr);
DCHECK_GE(level, decrypter_level_);
decrypter_.reset(decrypter);
decrypter_level_ = level;
@@ -1671,7 +1671,7 @@ void QuicFramer::SetEncrypter(EncryptionLevel level,
const QuicEncrypter* QuicFramer::encrypter(EncryptionLevel level) const {
DCHECK_GE(level, 0);
DCHECK_LT(level, NUM_ENCRYPTION_LEVELS);
- DCHECK(encrypter_[level].get() != NULL);
+ DCHECK(encrypter_[level].get() != nullptr);
return encrypter_[level].get();
}
@@ -1679,13 +1679,13 @@ QuicEncryptedPacket* QuicFramer::EncryptPacket(
EncryptionLevel level,
QuicPacketSequenceNumber packet_sequence_number,
const QuicPacket& packet) {
- DCHECK(encrypter_[level].get() != NULL);
+ DCHECK(encrypter_[level].get() != nullptr);
scoped_ptr<QuicData> out(encrypter_[level]->EncryptPacket(
packet_sequence_number, packet.AssociatedData(), packet.Plaintext()));
- if (out.get() == NULL) {
+ if (out.get() == nullptr) {
RaiseError(QUIC_ENCRYPTION_FAILURE);
- return NULL;
+ return nullptr;
}
StringPiece header_data = packet.BeforePlaintext();
size_t len = header_data.length() + out->length();
@@ -1702,7 +1702,7 @@ size_t QuicFramer::GetMaxPlaintextSize(size_t ciphertext_size) {
size_t min_plaintext_size = ciphertext_size;
for (int i = ENCRYPTION_NONE; i < NUM_ENCRYPTION_LEVELS; i++) {
- if (encrypter_[i].get() != NULL) {
+ if (encrypter_[i].get() != nullptr) {
size_t size = encrypter_[i]->GetMaxPlaintextSize(ciphertext_size);
if (size < min_plaintext_size) {
min_plaintext_size = size;
@@ -1719,7 +1719,7 @@ bool QuicFramer::DecryptPayload(const QuicPacketHeader& header,
if (!reader_->ReadStringPiece(&encrypted, reader_->BytesRemaining())) {
return false;
}
- DCHECK(decrypter_.get() != NULL);
+ DCHECK(decrypter_.get() != nullptr);
decrypted_.reset(decrypter_->DecryptPacket(
header.packet_sequence_number,
GetAssociatedDataFromEncryptedPacket(
@@ -1728,9 +1728,9 @@ bool QuicFramer::DecryptPayload(const QuicPacketHeader& header,
header.public_header.version_flag,
header.public_header.sequence_number_length),
encrypted));
- if (decrypted_.get() != NULL) {
+ if (decrypted_.get() != nullptr) {
visitor_->OnDecryptedPacket(decrypter_level_);
- } else if (alternative_decrypter_.get() != NULL) {
+ } else if (alternative_decrypter_.get() != nullptr) {
decrypted_.reset(alternative_decrypter_->DecryptPacket(
header.packet_sequence_number,
GetAssociatedDataFromEncryptedPacket(
@@ -1739,7 +1739,7 @@ bool QuicFramer::DecryptPayload(const QuicPacketHeader& header,
header.public_header.version_flag,
header.public_header.sequence_number_length),
encrypted));
- if (decrypted_.get() != NULL) {
+ if (decrypted_.get() != nullptr) {
visitor_->OnDecryptedPacket(alternative_decrypter_level_);
if (alternative_decrypter_latch_) {
// Switch to the alternative decrypter and latch so that we cannot
@@ -1757,7 +1757,7 @@ bool QuicFramer::DecryptPayload(const QuicPacketHeader& header,
}
}
- if (decrypted_.get() == NULL) {
+ if (decrypted_.get() == nullptr) {
DLOG(WARNING) << "DecryptPacket failed for sequence_number:"
<< header.packet_sequence_number;
return false;
@@ -1874,7 +1874,7 @@ bool QuicFramer::AppendTypeByte(const QuicFrame& frame,
uint8 type_byte = 0;
switch (frame.type) {
case STREAM_FRAME: {
- if (frame.stream_frame == NULL) {
+ if (frame.stream_frame == nullptr) {
LOG(DFATAL) << "Failed to append STREAM frame with no stream_frame.";
}
// Fin bit.
@@ -2318,7 +2318,7 @@ bool QuicFramer::RaiseError(QuicErrorCode error) {
DVLOG(1) << "Error detail: " << detailed_error_;
set_error(error);
visitor_->OnError(this);
- reader_.reset(NULL);
+ reader_.reset(nullptr);
return false;
}
« no previous file with comments | « net/quic/quic_framer.h ('k') | net/quic/quic_framer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698