Fix breakage introduced on 64-bit platforms with my last commit. Need

to change to size_t in a couple of other places too.

1 files changed, 7 insertions, 7 deletions

diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 0acea82..e290c90 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -180,7 +180,7 @@ static int
 CondGetArg(char **linePtr, char **argPtr, char *func, Boolean parens)
 {
     char	  *cp;
-    int	    	  argLen;
+    size_t    	  argLen;
     Buffer	  buf;
 
     cp = *linePtr;
@@ -223,7 +223,7 @@ CondGetArg(char **linePtr, char **argPtr, char *func, Boolean parens)
 	     * though perhaps we should...
 	     */
 	    char  	*cp2;
-	    int		len;
+	    size_t	len;
 	    Boolean	doFree;
 
 	    cp2 = Var_Parse(cp, VAR_CMD, TRUE, &len, &doFree);
@@ -507,7 +507,7 @@ CondToken(Boolean doEval)
 		char	*lhs;
 		char	*rhs;
 		char	*op;
-		int	varSpecLen;
+		size_t	varSpecLen;
 		Boolean	doFree;
 
 		/*
@@ -621,7 +621,7 @@ do_string_compare:
 			    cp++;
 			    Buf_AddByte(buf, (Byte)*cp);
 			} else if (*cp == '$') {
-			    int	len;
+			    size_t len;
 			    Boolean freeIt;
 
 			    cp2 = Var_Parse(cp, VAR_CMD, doEval, &len, &freeIt);
@@ -641,7 +641,7 @@ do_string_compare:
 
 		    Buf_AddByte(buf, (Byte)0);
 
-		    string = (char *)Buf_GetAll(buf, (int *)NULL);
+		    string = (char *)Buf_GetAll(buf, (size_t *)NULL);
 		    Buf_Destroy(buf, FALSE);
 
 		    DEBUGF(COND, ("lhs = \"%s\", rhs = \"%s\", op = %.2s\n",
@@ -673,7 +673,7 @@ do_string_compare:
 		    if (*CondCvtArg(lhs, &left) != '\0')
 			goto do_string_compare;
 		    if (*rhs == '$') {
-			int 	len;
+			size_t len;
 			Boolean	freeIt;
 
 			string = Var_Parse(rhs, VAR_CMD, doEval, &len, &freeIt);
@@ -794,7 +794,7 @@ error:
 		     * Use Var_Parse to parse the spec in parens and return
 		     * True if the resulting string is empty.
 		     */
-		    int	    length;
+		    size_t length;
 		    Boolean doFree;
 		    char    *val;