From 729476d0b00f30d407cbacc333b2d52ea530c9b8 Mon Sep 17 00:00:00 2001
From: Derek Argueta <dereka@pinterest.com>
Date: Thu, 1 Aug 2019 00:54:45 +0000
Subject: [PATCH] clang-tidy modernize-use-nullptr

Signed-off-by: Derek Argueta <dereka@pinterest.com>
---
 .clang-tidy                                      |  1 +
 .../proxy_protocol/proxy_protocol_header.h       |  2 +-
 test/common/buffer/buffer_test.cc                |  2 +-
 .../common/tap/tap_config_base_test.cc           | 16 ++++++++--------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 09fb39413ac8a..69c3b70a671c1 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -26,6 +26,7 @@ WarningsAsErrors: 'abseil-duration-*,
                    modernize-return-braced-init-list,
                    modernize-use-default-member-init,
                    modernize-use-equals-default,
+                   modernize-use-nullptr,
                    modernize-use-override,
                    modernize-use-using,
                    performance-faster-string-find,
diff --git a/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h b/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h
index fda95268dd2ba..4d3ea34c138ec 100644
--- a/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h
+++ b/source/extensions/filters/listener/proxy_protocol/proxy_protocol_header.h
@@ -27,7 +27,7 @@ constexpr uint32_t PROXY_PROTO_V2_AF_UNIX = 0x3;
 struct WireHeader {
   WireHeader(size_t extensions_length)
       : extensions_length_(extensions_length), protocol_version_(Network::Address::IpVersion::v4),
-        remote_address_(0), local_address_(0), local_command_(true) {}
+        remote_address_(nullptr), local_address_(nullptr), local_command_(true) {}
   WireHeader(size_t extensions_length, Network::Address::IpVersion protocol_version,
              Network::Address::InstanceConstSharedPtr remote_address,
              Network::Address::InstanceConstSharedPtr local_address)
diff --git a/test/common/buffer/buffer_test.cc b/test/common/buffer/buffer_test.cc
index aaa1c34ba02be..ac8cff975e5e3 100644
--- a/test/common/buffer/buffer_test.cc
+++ b/test/common/buffer/buffer_test.cc
@@ -42,7 +42,7 @@ class OwnedSliceTest : public testing::Test {
   static void expectReservationFailure(const Slice::Reservation& reservation, const Slice& slice,
                                        uint64_t reservable_size) {
     EXPECT_EQ(nullptr, reservation.mem_);
-    EXPECT_EQ(0, reservation.mem_);
+    EXPECT_EQ(nullptr, reservation.mem_);
     EXPECT_EQ(reservable_size, slice.reservableSize());
   }
 
diff --git a/test/extensions/common/tap/tap_config_base_test.cc b/test/extensions/common/tap/tap_config_base_test.cc
index c7d83a796f0a2..e95ac433894b4 100644
--- a/test/extensions/common/tap/tap_config_base_test.cc
+++ b/test/extensions/common/tap/tap_config_base_test.cc
@@ -96,15 +96,15 @@ TEST(TrimSlice, All) {
   }
 
   {
-    std::vector<Buffer::RawSlice> slices = {{0x0, 5}};
+    std::vector<Buffer::RawSlice> slices = {{nullptr, 5}};
     Utility::trimSlices(slices, 0, 100);
 
-    const std::vector<Buffer::RawSlice> expected{{0x0, 5}};
+    const std::vector<Buffer::RawSlice> expected{{nullptr, 5}};
     EXPECT_EQ(expected, slices);
   }
 
   {
-    std::vector<Buffer::RawSlice> slices = {{0x0, 5}};
+    std::vector<Buffer::RawSlice> slices = {{nullptr, 5}};
     Utility::trimSlices(slices, 3, 3);
 
     const std::vector<Buffer::RawSlice> expected{{reinterpret_cast<void*>(0x3), 2}};
@@ -112,7 +112,7 @@ TEST(TrimSlice, All) {
   }
 
   {
-    std::vector<Buffer::RawSlice> slices = {{0x0, 5}, {0x0, 4}};
+    std::vector<Buffer::RawSlice> slices = {{nullptr, 5}, {nullptr, 4}};
     Utility::trimSlices(slices, 3, 3);
 
     const std::vector<Buffer::RawSlice> expected{{reinterpret_cast<void*>(0x3), 2},
@@ -121,7 +121,7 @@ TEST(TrimSlice, All) {
   }
 
   {
-    std::vector<Buffer::RawSlice> slices = {{0x0, 5}, {0x0, 4}};
+    std::vector<Buffer::RawSlice> slices = {{nullptr, 5}, {nullptr, 4}};
     Utility::trimSlices(slices, 6, 3);
 
     const std::vector<Buffer::RawSlice> expected{{reinterpret_cast<void*>(0x5), 0},
@@ -130,7 +130,7 @@ TEST(TrimSlice, All) {
   }
 
   {
-    std::vector<Buffer::RawSlice> slices = {{0x0, 5}, {0x0, 4}};
+    std::vector<Buffer::RawSlice> slices = {{nullptr, 5}, {nullptr, 4}};
     Utility::trimSlices(slices, 0, 0);
 
     const std::vector<Buffer::RawSlice> expected{{reinterpret_cast<void*>(0x0), 0},
@@ -139,7 +139,7 @@ TEST(TrimSlice, All) {
   }
 
   {
-    std::vector<Buffer::RawSlice> slices = {{0x0, 5}, {0x0, 4}};
+    std::vector<Buffer::RawSlice> slices = {{nullptr, 5}, {nullptr, 4}};
     Utility::trimSlices(slices, 0, 3);
 
     const std::vector<Buffer::RawSlice> expected{{reinterpret_cast<void*>(0x0), 3},
@@ -148,7 +148,7 @@ TEST(TrimSlice, All) {
   }
 
   {
-    std::vector<Buffer::RawSlice> slices = {{0x0, 5}, {0x0, 4}};
+    std::vector<Buffer::RawSlice> slices = {{nullptr, 5}, {nullptr, 4}};
     Utility::trimSlices(slices, 1, 3);
 
     const std::vector<Buffer::RawSlice> expected{{reinterpret_cast<void*>(0x1), 3},