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

[thirdparty/squid.git] / src / helper / Reply.cc

diff --git a/src/helper/Reply.cc b/src/helper/Reply.cc
index a4da56f773b0026a2e28c391985b64d8789c6ed9..5e8826752b8b4625c6bc4599c597a308269cc8c7 100644 (file)
--- a/src/helper/Reply.cc
+++ b/src/helper/Reply.cc
@@ -75,8 +75,8 @@ Helper::Reply::finalize()
             result = Helper::TT;
             p+=3;
             // followed by an auth token
-            char *w1 = strwordtok(NULL, &p);
-            if (w1 != NULL) {
+            char *w1 = strwordtok(nullptr, &p);
+            if (w1 != nullptr) {
                 const char *authToken = w1;
                 notes.add("token",authToken);
             } else {
@@ -92,9 +92,9 @@ Helper::Reply::finalize()
             // followed by:
             //  an optional auth token and user field
             // or, an optional username field
-            char *w1 = strwordtok(NULL, &p);
-            char *w2 = strwordtok(NULL, &p);
-            if (w2 != NULL) {
+            char *w1 = strwordtok(nullptr, &p);
+            char *w2 = strwordtok(nullptr, &p);
+            if (w2 != nullptr) {
                 // Negotiate "token user"
                 const char *authToken = w1;
                 notes.add("token",authToken);
@@ -102,7 +102,7 @@ Helper::Reply::finalize()
                 const char *user = w2;
                 notes.add("user",user);
 
-            } else if (w1 != NULL) {
+            } else if (w1 != nullptr) {
                 // NTLM "user"
                 const char *user = w1;
                 notes.add("user",user);
@@ -172,8 +172,8 @@ Helper::Reply::parseResponseKeys()
 
         // the value may be a quoted string or a token
         const bool urlDecode = (*p != '"'); // check before moving p.
-        char *v = strwordtok(NULL, &p);
-        if (v != NULL && urlDecode && (p-v) > 2) // 1-octet %-escaped requires 3 bytes
+        char *v = strwordtok(nullptr, &p);
+        if (v != nullptr && urlDecode && (p-v) > 2) // 1-octet %-escaped requires 3 bytes
             rfc1738_unescape(v);
 
         notes.add(key, v ? v : ""); // value can be empty, but must not be NULL