r1575 - in trunk/varnish-cache: bin/varnishd include lib/libvarnish

[phk at projects.linpro.no]

Author: phk
Date: 2007-06-26 11:37:18 +0200 (Tue, 26 Jun 2007)
New Revision: 1575

Modified:
   trunk/varnish-cache/bin/varnishd/cache_session.c
   trunk/varnish-cache/include/libvarnish.h
   trunk/varnish-cache/lib/libvarnish/crc32.c
Log:
Retire the crc32_2s() function.



Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c	2007-06-26 06:56:03 UTC (rev 1574)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c	2007-06-26 09:37:18 UTC (rev 1575)
@@ -127,7 +127,7 @@
 		return;
 	}
 	AZ(sp->srcaddr);
-	u = crc32_2s(sp->addr, "");
+	u = crc32_l(sp->addr, strlen(sp->addr));
 	v = u % nsrchash;
 	ch = &srchash[v];
 	CHECK_OBJ(ch, SRCADDRHEAD_MAGIC);

Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h	2007-06-26 06:56:03 UTC (rev 1574)
+++ trunk/varnish-cache/include/libvarnish.h	2007-06-26 09:37:18 UTC (rev 1575)
@@ -42,7 +42,6 @@
 char **ParseArgv(const char *s, int comment);
 
 /* from libvarnish/crc32.c */
-uint32_t crc32_2s(const char *p1, const char *p2);
 uint32_t crc32_l(const void *p1, unsigned l);
 
 /* from libvarnish/time.c */

Modified: trunk/varnish-cache/lib/libvarnish/crc32.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/crc32.c	2007-06-26 06:56:03 UTC (rev 1574)
+++ trunk/varnish-cache/lib/libvarnish/crc32.c	2007-06-26 09:37:18 UTC (rev 1575)
@@ -82,22 +82,6 @@
 };
 
 uint32_t
-crc32_2s(const char *p1, const char *p2)
-{
-	const unsigned char *p;
-	uint32_t crc;
-
-	crc = ~0U;
-
-	for (p = (const unsigned char*)p1; *p != '\0'; p++)
-		crc = (crc >> 8) ^ crc32bits[(crc ^ *p) & 0xff];
-	for (p = (const unsigned char*)p2; *p != '\0'; p++)
-		crc = (crc >> 8) ^ crc32bits[(crc ^ *p) & 0xff];
-
-	return (crc ^ ~0U);
-}
-
-uint32_t
 crc32_l(const void *p1, unsigned l)
 {
 	const unsigned char *p;