rename memoryAccounted() to statMemoryAccounted() and make it global

diff --git a/src/protos.h b/src/protos.h
index c3e9a09ac1efcb11553d39fe6f9ee5458f86f8b7..05aff4f2fe9c9bac3881e96cd12efc09de93f21f 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -251,6 +251,10 @@ extern PF snmpHandleUdp;
 extern void snmpInit(void);
 extern void snmpConnectionOpen(void);
 extern void snmpConnectionClose(void);
+extern int create_view (char **);
+extern int create_user (char **);
+extern int create_community (char **);
+extern void tokenize (char *, char **, int);
 #endif /* SQUID_SNMP */
 
 extern void AppendUdp(icpUdpData *);
@@ -381,6 +385,7 @@ extern void stackFreeMemory(Stack *);
 extern void stat_init(cacheinfo **, const char *);
 extern void pconnHistCount(int, int);
 extern void statAvgInit(void);
+extern int statMemoryAccounted(void);
 
 /* To reduce memory fragmentation, we now store the memory version of an
  * object in fixed size blocks of size PAGE_SIZE and instead of calling 

diff --git a/src/stat.cc b/src/stat.cc
index 6106a2adc8518594ee7bcedfc84f81091b9c3e4a..072faa57e20b9b8d2dfb98c2fb10a6db1f65efff 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.178 1997/12/02 00:17:43 wessels Exp $
+ * $Id: stat.cc,v 1.179 1997/12/03 01:31:40 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -115,7 +115,6 @@ static void proto_count(cacheinfo *, protocol_t, log_type);
 static void proto_newobject(cacheinfo *, protocol_t, int, int);
 static void proto_purgeobject(cacheinfo *, protocol_t, int);
 static void proto_touchobject(cacheinfo *, protocol_t, int);
-int memoryAccounted(void);
 static void statAvgTick(void *notused);
 
 #ifdef XMALLOC_STATISTICS
@@ -497,7 +496,7 @@ statFiledescriptors(StoreEntry * sentry)
 }
 
 int
-memoryAccounted(void)
+statMemoryAccounted(void)
 {
     return (int)
        meta_data.store_entries * sizeof(StoreEntry) +
@@ -733,7 +732,7 @@ info_get(StoreEntry * sentry)
 
     storeAppendPrintf(sentry, "{\t%-25.25s                      = %6d KB}\n",
        "Total Accounted",
-       memoryAccounted() >> 10);
+       statMemoryAccounted() >> 10);
 
 #if XMALLOC_STATISTICS
     storeAppendPrintf(sentry, "{Memory allocation statistics}\n");