remove unused members of IpcacheStats and FqdncacheStats. In particular,

errors, release_locked, ghbn_calls, gbha_calls

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index b4f3c6f49519ef0a1022dfe50f58ab7929497aef..c9fc2948806c089afadc5f7efb4fa99ae9146555 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.153 2003/01/23 00:37:21 robertc Exp $
+ * $Id: fqdncache.cc,v 1.154 2003/02/13 20:47:53 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -65,8 +65,6 @@ static struct {
     int hits;
     int misses;
     int negative_hits;
-    int errors;
-    int ghba_calls;            /* # calls to blocking gethostbyaddr() */
 } FqdncacheStats;
 
 static dlink_list lru_list;
@@ -470,8 +468,6 @@ fqdnStats(StoreEntry * sentry)
        FqdncacheStats.negative_hits);
     storeAppendPrintf(sentry, "FQDNcache Misses: %d\n",
        FqdncacheStats.misses);
-    storeAppendPrintf(sentry, "Blocking calls to gethostbyaddr(): %d\n",
-       FqdncacheStats.ghba_calls);
     storeAppendPrintf(sentry, "FQDN Cache Contents:\n\n");
     storeAppendPrintf(sentry, "%-15.15s %3s %3s %3s %s\n",
        "Address", "Flg", "TTL", "Cnt", "Hostnames");
@@ -637,7 +633,7 @@ snmp_netFqdnFn(variable_list * Var, snint * ErrP)
        break;
     case FQDN_GHBN:
        Answer = snmp_var_new_integer(Var->name, Var->name_length,
-           FqdncacheStats.ghba_calls,
+           0, /* deprecated */
            SMI_COUNTER32);
        break;
     default:

diff --git a/src/ipcache.cc b/src/ipcache.cc
index ff6d9831055c538b2fc6a2ba78999bc61d6bbb44..801f212cc62cd3c65d8797ca2c332bfa7a038ee4 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.240 2003/01/23 00:37:22 robertc Exp $
+ * $Id: ipcache.cc,v 1.241 2003/02/13 20:47:53 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -61,9 +61,6 @@ static struct {
     int hits;
     int misses;
     int negative_hits;
-    int errors;
-    int ghbn_calls;            /* # calls to blocking gethostbyname() */
-    int release_locked;
 } IpcacheStats;
 
 static dlink_list lru_list;
@@ -106,7 +103,6 @@ ipcache_testname(void)
     if ((w = Config.dns_testname_list) == NULL)
        return 1;
     for (; w; w = w->next) {
-       IpcacheStats.ghbn_calls++;
        if (gethostbyname(w->key) != NULL)
            return 1;
     }
@@ -537,10 +533,6 @@ stat_ipcache_get(StoreEntry * sentry)
        IpcacheStats.negative_hits);
     storeAppendPrintf(sentry, "IPcache Misses: %d\n",
        IpcacheStats.misses);
-    storeAppendPrintf(sentry, "Blocking calls to gethostbyname(): %d\n",
-       IpcacheStats.ghbn_calls);
-    storeAppendPrintf(sentry, "Attempts to release locked entries: %d\n",
-       IpcacheStats.release_locked);
     storeAppendPrintf(sentry, "\n\n");
     storeAppendPrintf(sentry, "IP Cache Contents:\n\n");
     storeAppendPrintf(sentry, " %-29.29s %3s %6s %6s %1s\n",
@@ -804,12 +796,12 @@ snmp_netIpFn(variable_list * Var, snint * ErrP)
        break;
     case IP_GHBN:
        Answer = snmp_var_new_integer(Var->name, Var->name_length,
-           IpcacheStats.ghbn_calls,
+           0, /* deprecated */
            SMI_COUNTER32);
        break;
     case IP_LOC:
        Answer = snmp_var_new_integer(Var->name, Var->name_length,
-           IpcacheStats.release_locked,
+           0, /* deprecated */
            SMI_COUNTER32);
        break;
     default: