replaced urlcmp with straight strcmp

diff --git a/src/acl.cc b/src/acl.cc
index 0ad63c56d66ff85f899d118d2816ad3e86b1c91a..63f679a473b8e923d3fb68e58798b4598bcbcc64 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.cc,v 1.172 1998/07/22 20:36:57 wessels Exp $
+ * $Id: acl.cc,v 1.173 1998/07/23 19:57:47 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -1824,7 +1824,7 @@ aclReadProxyAuth(acl_proxy_auth * p)
        hashFreeItems(p->hash, aclFreeProxyAuthUser);
        hashFreeMemory(p->hash);
     }
-    p->hash = hash_create(urlcmp, 7921, hash_string);
+    p->hash = hash_create((HASHCMP*) strcmp, 7921, hash_string);
     assert(NULL != p->hash);
     passwords = xmalloc((size_t) buf.st_size + 2);
     f = fopen(p->filename, "r");

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 96427c253f9e9f2d1b68201b1dc68e3a8f6a2a74..4bfcc301df8b803d3b5d6ef936caf86f0424df2e 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,7 +1,7 @@
 
 
 /*
- * $Id: fqdncache.cc,v 1.108 1998/07/22 20:37:21 wessels Exp $
+ * $Id: fqdncache.cc,v 1.109 1998/07/23 19:57:49 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -536,7 +536,7 @@ fqdncache_init(void)
     fqdncache_low = (long) (((float) MAX_FQDN *
            (float) FQDN_LOW_WATER) / (float) 100);
     n = hashPrime(fqdncache_high / 4);
-    fqdn_table = hash_create(urlcmp, n, hash4);
+    fqdn_table = hash_create((HASHCMP*) strcmp, n, hash4);
     cachemgrRegister("fqdncache",
        "FQDN Cache Stats and Contents",
        fqdnStats, 0, 1);

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 69e0f3a320d10166162fd4e4618ef300722ae2ff..e6738d00ea8fd9ef9c6e3e67f8547bce44528c72 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.194 1998/07/22 20:37:32 wessels Exp $
+ * $Id: ipcache.cc,v 1.195 1998/07/23 19:57:50 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -604,7 +604,7 @@ ipcache_init(void)
     ipcache_low = (long) (((float) Config.ipcache.size *
            (float) Config.ipcache.low) / (float) 100);
     n = hashPrime(ipcache_high / 4);
-    ip_table = hash_create(urlcmp, n, hash4);
+    ip_table = hash_create((HASHCMP*) strcmp, n, hash4);
     cachemgrRegister("ipcache",
        "IP Cache Stats and Contents",
        stat_ipcache_get, 0, 1);

diff --git a/src/protos.h b/src/protos.h
index 9a143f366ef65a4574610c1858ddd77da95b52cf..9d3339023dc9e0a98d9302e5843e8c13e6389a98 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.240 1998/07/22 21:24:41 wessels Exp $
+ * $Id: protos.h,v 1.241 1998/07/23 19:57:52 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -751,7 +751,6 @@ extern void storeClientCopy(StoreEntry * e,
     STCB * callback,
     void *data);
 extern int storePendingNClients(const StoreEntry *);
-extern HASHCMP urlcmp;
 extern EVH storeMaintainSwapSpace;
 extern void storeExpireNow(StoreEntry *);
 extern void storeReleaseRequest(StoreEntry *);

diff --git a/src/store.cc b/src/store.cc
index dbf290c4dab4eb529455790b2de5c9e5ac4306bf..e8f8e36f21878e771b10e26f48db68595e907bb1 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.432 1998/07/22 22:25:18 wessels Exp $
+ * $Id: store.cc,v 1.433 1998/07/23 19:57:54 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -806,13 +806,6 @@ storeConfigure(void)
     store_pages_low = store_mem_low / SM_PAGE_SIZE;
 }
 
-int
-urlcmp(const void *url1, const void *url2)
-{
-    assert(url1 && url2);
-    return (strcmp(url1, url2));
-}
-
 static int
 storeKeepInMemory(const StoreEntry * e)
 {