Retire the crc32_2s() function.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@1575 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_session.c

@@ -127,7 +127,7 @@ SES_RefSrcAddr(struct sess *sp)
 		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);

include/libvarnish.h

@@ -42,7 +42,6 @@ void FreeArgv(char **argv);
 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 */

lib/libvarnish/crc32.c

@@ -81,22 +81,6 @@ static uint32_t crc32bits[] = {
     0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
 };
 
-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)
 {