diff options
| author | sjg <sjg@FreeBSD.org> | 2013-06-05 16:12:50 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-06-05 16:12:50 +0000 |
| commit | 5d26938b1d35cf753994309c70a0ef31b8302288 (patch) | |
| tree | 789e70a5bdc53ba9877c05494da4c8f48c6b0b2c /contrib/bmake/var.c | |
| parent | ad8f1288616c7cfbc352251ce284661623f69fb8 (diff) | |
| download | FreeBSD-src-5d26938b1d35cf753994309c70a0ef31b8302288.zip FreeBSD-src-5d26938b1d35cf753994309c70a0ef31b8302288.tar.gz | |
Update to bmake-20130604 to fix file descriptor leak.
Diffstat (limited to 'contrib/bmake/var.c')
| -rw-r--r-- | contrib/bmake/var.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/contrib/bmake/var.c b/contrib/bmake/var.c index f09862a..8ad0a4e 100644 --- a/contrib/bmake/var.c +++ b/contrib/bmake/var.c @@ -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 @@ -2326,9 +2326,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; @@ -2358,7 +2356,7 @@ VarHash(char *str) h = (h << 13) ^ (h >> 19); h = h * 5 + 0x52dce729U; h ^= k; - } while (!done); + } h ^= len2; h *= 0x85ebca6b; h ^= h >> 13; |
