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

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

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index c7341246800f09f99d626e355428140563159c54..32b60a36ab78f56199c60b4ba186d2689e170a76 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -38,7 +38,7 @@
 variable_list *
 snmp_sysFn(variable_list * Var, snint * ErrP)
 {
-    variable_list *Answer = NULL;
+    variable_list *Answer = nullptr;
     MemBuf tmp;
     debugs(49, 5, "snmp_sysFn: Processing request:" << snmpDebugOid(Var->name, Var->name_length, tmp));
     *ErrP = SNMP_ERR_NOERROR;
@@ -77,8 +77,8 @@ snmp_sysFn(variable_list * Var, snint * ErrP)
 variable_list *
 snmp_confFn(variable_list * Var, snint * ErrP)
 {
-    variable_list *Answer = NULL;
-    const char *cp = NULL;
+    variable_list *Answer = nullptr;
+    const char *cp = nullptr;
     debugs(49, 5, "snmp_confFn: Processing request with magic " << Var->name[8] << "!");
     *ErrP = SNMP_ERR_NOERROR;
 
@@ -183,26 +183,26 @@ snmp_confFn(variable_list * Var, snint * ErrP)
 variable_list *
 snmp_meshPtblFn(variable_list * Var, snint * ErrP)
 {
-    variable_list *Answer = NULL;
+    variable_list *Answer = nullptr;
 
     Ip::Address laddr;
-    char *cp = NULL;
-    CachePeer *p = NULL;
+    char *cp = nullptr;
+    CachePeer *p = nullptr;
     int cnt = 0;
     debugs(49, 5, "snmp_meshPtblFn: peer " << Var->name[LEN_SQ_MESH + 3] << " requested!");
     *ErrP = SNMP_ERR_NOERROR;
 
     u_int index = Var->name[LEN_SQ_MESH + 3] ;
-    for (p = Config.peers; p != NULL; p = p->next, ++cnt) {
+    for (p = Config.peers; p != nullptr; p = p->next, ++cnt) {
         if (p->index == index) {
             laddr = p->in_addr ;
             break;
         }
     }
 
-    if (p == NULL) {
+    if (p == nullptr) {
         *ErrP = SNMP_ERR_NOSUCHNAME;
-        return NULL;
+        return nullptr;
     }
 
     switch (Var->name[LEN_SQ_MESH + 2]) {
@@ -318,7 +318,7 @@ snmp_meshPtblFn(variable_list * Var, snint * ErrP)
 variable_list *
 snmp_prfSysFn(variable_list * Var, snint * ErrP)
 {
-    variable_list *Answer = NULL;
+    variable_list *Answer = nullptr;
 
     static struct rusage rusage;
     debugs(49, 5, "snmp_prfSysFn: Processing request with magic " << Var->name[LEN_SQ_PRF + 1] << "!");
@@ -420,9 +420,9 @@ snmp_prfSysFn(variable_list * Var, snint * ErrP)
 variable_list *
 snmp_prfProtoFn(variable_list * Var, snint * ErrP)
 {
-    variable_list *Answer = NULL;
-    static StatCounters *f = NULL;
-    static StatCounters *l = NULL;
+    variable_list *Answer = nullptr;
+    static StatCounters *f = nullptr;
+    static StatCounters *l = nullptr;
     double x;
     int minutes;
     debugs(49, 5, "snmp_prfProtoFn: Processing request with magic " << Var->name[LEN_SQ_PRF] << "!");
@@ -601,7 +601,7 @@ snmp_prfProtoFn(variable_list * Var, snint * ErrP)
 
         default:
             *ErrP = SNMP_ERR_NOSUCHNAME;
-            return NULL;
+            return nullptr;
         }
 
         return snmp_var_new_integer(Var->name, Var->name_length,
@@ -610,6 +610,6 @@ snmp_prfProtoFn(variable_list * Var, snint * ErrP)
     }
 
     *ErrP = SNMP_ERR_NOSUCHNAME;
-    return NULL;
+    return nullptr;
 }