diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 1999-12-16 16:52:12 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 1999-12-16 16:52:12 +0000 |
| commit | 89a71bad14daa17b95d5d5d0bd2e18578197640c (patch) | |
| tree | 0a77318bc3362e49a335b17bd20883019512ca4e /usr.bin/make/var.c | |
| parent | 296ccc19536f9d5d7d391200ec996df08ccac23f (diff) | |
Remove unneeded extraneous zeros at the end of buffers.
Actually, one of these needs to be there, because of two bugs in cond.c
Diffstat (limited to 'usr.bin/make/var.c')
| -rw-r--r-- | usr.bin/make/var.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c index 01faa29604f..afad7b4f554 100644 --- a/usr.bin/make/var.c +++ b/usr.bin/make/var.c @@ -1,4 +1,4 @@ -/* $OpenBSD: var.c,v 1.21 1999/12/16 16:41:42 espie Exp $ */ +/* $OpenBSD: var.c,v 1.22 1999/12/16 16:52:11 espie Exp $ */ /* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */ /* @@ -70,7 +70,7 @@ #if 0 static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: var.c,v 1.21 1999/12/16 16:41:42 espie Exp $"; +static char rcsid[] = "$OpenBSD: var.c,v 1.22 1999/12/16 16:52:11 espie Exp $"; #endif #endif /* not lint */ @@ -1278,7 +1278,6 @@ VarModify (str, modProc, datum) free(as); free(av); - Buf_AddChar(buf, '\0'); str = Buf_Retrieve(buf); Buf_Destroy(buf, FALSE); return (str); @@ -1369,8 +1368,6 @@ VarGetPattern(ctxt, err, tstr, delim, flags, length, pattern) Buf_AddChar(buf, *cp); } - Buf_AddChar(buf, '\0'); - if (*cp != delim) { *tstr = cp; *length = 0; @@ -1380,7 +1377,6 @@ VarGetPattern(ctxt, err, tstr, delim, flags, length, pattern) *tstr = ++cp; cp = Buf_Retrieve(buf); *length = Buf_Size(buf); - *length -= 1; /* Don't count the NULL */ Buf_Destroy(buf, FALSE); return cp; } @@ -1414,7 +1410,6 @@ VarQuote(str) Buf_AddChar(buf, '\\'); Buf_AddChar(buf, *str); } - Buf_AddChar(buf, '\0'); str = Buf_Retrieve(buf); Buf_Destroy(buf, FALSE); return str; @@ -2257,7 +2252,6 @@ Var_Subst (var, str, ctxt, undefErr) } } - Buf_AddChar(buf, '\0'); str = Buf_Retrieve(buf); Buf_Destroy(buf, FALSE); return (str); |