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

[thirdparty/squid.git] / src / acl / Asn.cc

diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc
index 5f2372e716d9d015a058ba23a8baf0e521acc6e1..59037e2a391a66cebf4be809c70d1fab230267db 100644 (file)
--- a/src/acl/Asn.cc
+++ b/src/acl/Asn.cc
@@ -134,12 +134,12 @@ asnMatchIp(CbDataList<int> *data, Ip::Address &addr)
     struct squid_radix_node *rn;
     as_info *e;
     m_ADDR m_addr;
-    CbDataList<int> *a = NULL;
-    CbDataList<int> *b = NULL;
+    CbDataList<int> *a = nullptr;
+    CbDataList<int> *b = nullptr;
 
     debugs(53, 3, "asnMatchIp: Called for " << addr );
 
-    if (AS_tree_head == NULL)
+    if (AS_tree_head == nullptr)
         return 0;
 
     if (addr.isNoAddr())
@@ -152,7 +152,7 @@ asnMatchIp(CbDataList<int> *data, Ip::Address &addr)
 
     rn = squid_rn_match(&m_addr, AS_tree_head);
 
-    if (rn == NULL) {
+    if (rn == nullptr) {
         debugs(53, 3, "asnMatchIp: Address not in as db.");
         return 0;
     }
@@ -211,7 +211,7 @@ asnFreeMemory(void)
 {
     squid_rn_walktree(AS_tree_head, destroyRadixNode, AS_tree_head);
 
-    destroyRadixNode((struct squid_radix_node *) 0, (void *) AS_tree_head);
+    destroyRadixNode((struct squid_radix_node *) nullptr, (void *) AS_tree_head);
 }
 
 static void
@@ -378,9 +378,9 @@ static int
 asnAddNet(char *as_string, int as_number)
 {
     struct squid_radix_node *rn;
-    CbDataList<int> **Tail = NULL;
-    CbDataList<int> *q = NULL;
-    as_info *asinfo = NULL;
+    CbDataList<int> **Tail = nullptr;
+    CbDataList<int> *q = nullptr;
+    as_info *asinfo = nullptr;
 
     Ip::Address mask;
     Ip::Address addr;
@@ -389,7 +389,7 @@ asnAddNet(char *as_string, int as_number)
 
     t = strchr(as_string, '/');
 
-    if (t == NULL) {
+    if (t == nullptr) {
         debugs(53, 3, "asnAddNet: failed, invalid response from whois server.");
         return 0;
     }
@@ -406,7 +406,7 @@ asnAddNet(char *as_string, int as_number)
 
     // generate Netbits Format Mask
     mask.setNoAddr();
-    mask.applyMask(bitl, (t!=NULL?AF_INET:AF_INET6) );
+    mask.applyMask(bitl, (t!=nullptr?AF_INET:AF_INET6) );
 
     debugs(53, 3, "asnAddNet: called for " << addr << "/" << mask );
 
@@ -418,7 +418,7 @@ asnAddNet(char *as_string, int as_number)
 
     rn = squid_rn_lookup(&e->e_addr, &e->e_mask, AS_tree_head);
 
-    if (rn != NULL) {
+    if (rn != nullptr) {
         asinfo = ((rtentry_t *) rn)->e_info;
 
         if (asinfo->as_number->find(as_number)) {
@@ -439,11 +439,11 @@ asnAddNet(char *as_string, int as_number)
         asinfo->as_number = q;
         squid_rn_addroute(&e->e_addr, &e->e_mask, AS_tree_head, e->e_nodes);
         rn = squid_rn_match(&e->e_addr, AS_tree_head);
-        assert(rn != NULL);
+        assert(rn != nullptr);
         e->e_info = asinfo;
     }
 
-    if (rn == 0) {      /* assert might expand to nothing */
+    if (rn == nullptr) {      /* assert might expand to nothing */
         xfree(asinfo);
         delete q;
         xfree(e);
@@ -465,7 +465,7 @@ destroyRadixNode(struct squid_radix_node *rn, void *w)
         rtentry_t *e = (rtentry_t *) rn;
         rn = squid_rn_delete(rn->rn_key, rn->rn_mask, rnh);
 
-        if (rn == 0)
+        if (rn == nullptr)
             debugs(53, 3, "destroyRadixNode: internal screwup");
 
         destroyRadixNodeInfo(e->e_info);
@@ -479,7 +479,7 @@ destroyRadixNode(struct squid_radix_node *rn, void *w)
 static void
 destroyRadixNodeInfo(as_info * e_info)
 {
-    CbDataList<int> *prev = NULL;
+    CbDataList<int> *prev = nullptr;
     CbDataList<int> *data = e_info->as_number;
 
     while (data) {
@@ -538,7 +538,7 @@ ACLASN::dump() const
 
     CbDataList<int> *ldata = data;
 
-    while (ldata != NULL) {
+    while (ldata != nullptr) {
         SBuf s;
         s.Printf("%d", ldata->element);
         sl.push_back(s);
@@ -551,7 +551,7 @@ ACLASN::dump() const
 bool
 ACLASN::empty () const
 {
-    return data == NULL;
+    return data == nullptr;
 }
 
 void
@@ -559,8 +559,8 @@ ACLASN::parse()
 {
     CbDataList<int> **curlist = &data;
     CbDataList<int> **Tail;
-    CbDataList<int> *q = NULL;
-    char *t = NULL;
+    CbDataList<int> *q = nullptr;
+    char *t = nullptr;
 
     for (Tail = curlist; *Tail; Tail = &((*Tail)->next));
     while ((t = ConfigParser::strtokFile())) {