Module Name: src
Committed By: sjg
Date: Wed May 29 00:23:31 UTC 2013
Modified Files:
src/usr.bin/make: var.c
Log Message:
Clean up some left overs
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.174 src/usr.bin/make/var.c:1.175
--- src/usr.bin/make/var.c:1.174 Sat May 18 13:12:45 2013
+++ src/usr.bin/make/var.c Wed May 29 00:23:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.174 2013/05/18 13:12:45 sjg Exp $ */
+/* $NetBSD: var.c,v 1.175 2013/05/29 00:23:31 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.174 2013/05/18 13:12:45 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.175 2013/05/29 00:23:31 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.174 2013/05/18 13:12:45 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.175 2013/05/29 00:23:31 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -2304,9 +2304,7 @@ VarHash(char *str)
size_t len, len2;
unsigned char *ustr = (unsigned char *)str;
uint32_t h, k, c1, c2;
- int done;
- done = 1;
h = 0x971e137bU;
c1 = 0x95543787U;
c2 = 0x2ad7eb25U;
@@ -2336,7 +2334,7 @@ VarHash(char *str)
h = (h << 13) ^ (h >> 19);
h = h * 5 + 0x52dce729U;
h ^= k;
- } while (!done);
+ }
h ^= len2;
h *= 0x85ebca6b;
h ^= h >> 13;
