===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/cond.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/usr.bin/make/cond.c	1999/12/09 18:18:24	1.7
+++ src/usr.bin/make/cond.c	1999/12/16 16:41:41	1.8
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cond.c,v 1.7 1999/12/09 18:18:24 espie Exp $	*/
+/*	$OpenBSD: cond.c,v 1.8 1999/12/16 16:41:41 espie Exp $	*/
 /*	$NetBSD: cond.c,v 1.7 1996/11/06 17:59:02 christos Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
-static char rcsid[] = "$OpenBSD: cond.c,v 1.7 1999/12/09 18:18:24 espie Exp $";
+static char rcsid[] = "$OpenBSD: cond.c,v 1.8 1999/12/16 16:41:41 espie Exp $";
 #endif
 #endif /* not lint */
 
@@ -246,7 +246,8 @@
     }
 
     Buf_AddChar(buf, '\0');
-    *argPtr = Buf_GetAll(buf, &argLen);
+    *argPtr = Buf_Retrieve(buf);
+    argLen = Buf_Size(buf);
     Buf_Destroy(buf, FALSE);
 
     while (*cp == ' ' || *cp == '\t') {
@@ -556,7 +557,8 @@
 			Buf_AddChar(buf, *condExpr);
 
 		    Buf_AddChar(buf, '\0');
-		    lhs = Buf_GetAll(buf, &varSpecLen);
+		    lhs = Buf_Retrieve(buf);
+		    varSpecLen = Buf_Size(buf);
 		    Buf_Destroy(buf, FALSE);
 
 		    doFree = TRUE;
@@ -653,7 +655,7 @@
 
 		    Buf_AddChar(buf, '\0');
 
-		    string = Buf_GetAll(buf, NULL);
+		    string = Buf_Retrieve(buf);
 		    Buf_Destroy(buf, FALSE);
 
 		    if (DEBUG(COND)) {