Maintenance: Removed most NULLs using modernize-use-nullptr (#1075)

[thirdparty/squid.git] / src / HttpReply.cc

diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index d3fa3217fd421a374e411ccad8f30f49f7206971..9be1d1b3d3307986ff9d90f82be98ef73543858b 100644 (file)
--- a/src/HttpReply.cc
+++ b/src/HttpReply.cc
@@ -72,7 +72,7 @@ HttpReply::clean()
 {
     // we used to assert that the pipe is NULL, but now the message only
     // points to a pipe that is owned and initiated by another object.
-    body_pipe = NULL;
+    body_pipe = nullptr;
 
     body.clear();
     hdrCacheClean();
@@ -139,7 +139,7 @@ HttpReply::make304() const
     rv->content_type = content_type;
     /* rv->content_range */
     /* rv->keep_alive */
-    rv->sline.set(Http::ProtocolVersion(), Http::scNotModified, NULL);
+    rv->sline.set(Http::ProtocolVersion(), Http::scNotModified, nullptr);
 
     for (t = 0; ImsEntries[t] != Http::HdrType::OTHER; ++t) {
         if ((e = header.findEntry(ImsEntries[t])))
@@ -202,7 +202,7 @@ void
 HttpReply::redirect(Http::StatusCode status, const char *loc)
 {
     HttpHeader *hdr;
-    sline.set(Http::ProtocolVersion(), status, NULL);
+    sline.set(Http::ProtocolVersion(), status, nullptr);
     hdr = &header;
     hdr->putStr(Http::HdrType::SERVER, APP_FULLNAME);
     hdr->putTime(Http::HdrType::DATE, squid_curtime);
@@ -353,17 +353,17 @@ HttpReply::hdrCacheClean()
 
     if (cache_control) {
         delete cache_control;
-        cache_control = NULL;
+        cache_control = nullptr;
     }
 
     if (surrogate_control) {
         delete surrogate_control;
-        surrogate_control = NULL;
+        surrogate_control = nullptr;
     }
 
     if (content_range) {
         delete content_range;
-        content_range = NULL;
+        content_range = nullptr;
     }
 }
 
@@ -553,7 +553,7 @@ HttpReply::calcMaxBodySize(HttpRequest& request) const
     if (!Config.ReplyBodySize)
         return;
 
-    ACLFilledChecklist ch(NULL, &request, NULL);
+    ACLFilledChecklist ch(nullptr, &request, nullptr);
     // XXX: cont-cast becomes irrelevant when checklist is HttpReply::Pointer
     ch.reply = const_cast<HttpReply *>(this);
     HTTPMSGLOCK(ch.reply);
@@ -618,9 +618,9 @@ void HttpReply::removeStaleWarnings()
 String HttpReply::removeStaleWarningValues(const String &value)
 {
     String newValue;
-    const char *item = 0;
+    const char *item = nullptr;
     int len = 0;
-    const char *pos = 0;
+    const char *pos = nullptr;
     while (strListGetItem(&value, ',', &item, &len, &pos)) {
         bool keep = true;
         // Does warning-value have warn-date (which contains quoted date)?