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

[thirdparty/squid.git] / src / adaptation / Iterator.cc

diff --git a/src/adaptation/Iterator.cc b/src/adaptation/Iterator.cc
index 7210dafe54c128170c2e83ce4fc2dac9accbc703..968830fefafa4154970c8c5bf5d85ec5a8275974 100644 (file)
--- a/src/adaptation/Iterator.cc
+++ b/src/adaptation/Iterator.cc
@@ -29,14 +29,14 @@ Adaptation::Iterator::Iterator(
     theMsg(aMsg),
     theCause(aCause),
     al(alp),
-    theLauncher(0),
+    theLauncher(nullptr),
     iterations(0),
     adapted(false)
 {
-    if (theCause != NULL)
+    if (theCause != nullptr)
         HTTPMSGLOCK(theCause);
 
-    if (theMsg != NULL)
+    if (theMsg != nullptr)
         HTTPMSGLOCK(theMsg);
 }
 
@@ -96,7 +96,7 @@ void Adaptation::Iterator::step()
     }
 
     ServicePointer service = thePlan.current();
-    Must(service != NULL);
+    Must(service != nullptr);
     debugs(93,5, "using adaptation service: " << service->cfg().key);
 
     if (Adaptation::Config::needHistory) {
@@ -138,7 +138,7 @@ Adaptation::Iterator::handleAdaptedHeader(Http::Message *aMsg)
             if (HttpRequest *cause = dynamic_cast<HttpRequest*>(theMsg)) {
                 // definitely sent request, now use it as the cause
                 theCause = cause; // moving the lock
-                theMsg = 0;
+                theMsg = nullptr;
                 debugs(93,3, "in request satisfaction mode");
             }
         }
@@ -187,7 +187,7 @@ void Adaptation::Iterator::handleAdaptationError(bool final)
     debugs(85,5, "flags: " << srcIntact << canIgnore << adapted);
 
     if (srcIntact) {
-        if (thePlan.replacement(filter()) != NULL) {
+        if (thePlan.replacement(filter()) != nullptr) {
             debugs(93,3, "trying a replacement service");
             step();
             return;
@@ -268,13 +268,13 @@ Adaptation::ServiceFilter Adaptation::Iterator::filter() const
     // the method may differ from theGroup->method due to request satisfaction
     Method method = methodNone;
     // temporary variables, no locking needed
-    HttpRequest *req = NULL;
-    HttpReply *rep = NULL;
+    HttpRequest *req = nullptr;
+    HttpReply *rep = nullptr;
 
     if (HttpRequest *r = dynamic_cast<HttpRequest*>(theMsg)) {
         method = methodReqmod;
         req = r;
-        rep = NULL;
+        rep = nullptr;
     } else if (HttpReply *theReply = dynamic_cast<HttpReply*>(theMsg)) {
         method = methodRespmod;
         req = theCause;