===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/var.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -c -r1.67 -r1.68
*** src/usr.bin/make/var.c	2007/07/22 17:56:50	1.67
--- src/usr.bin/make/var.c	2007/07/24 18:52:47	1.68
***************
*** 1,5 ****
  /*	$OpenPackages$ */
! /*	$OpenBSD: var.c,v 1.67 2007/07/22 17:56:50 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
--- 1,5 ----
  /*	$OpenPackages$ */
! /*	$OpenBSD: var.c,v 1.68 2007/07/24 18:52:47 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
***************
*** 818,832 ****
  	}
  }
  
! size_t
! Var_ParseSkip(const char *str, SymTable *ctxt, bool *result)
  {
! 	const char *tstr;	/* Pointer into str */
! 	Var *v;			/* Variable in invocation */
! 	char paren;		/* Parenthesis or brace or nothing */
  	const char *start;
  	size_t length;
  	struct Name name;
  
  	v = NULL;
  	start = str;
--- 818,834 ----
  	}
  }
  
! bool
! Var_ParseSkip(const char **pstr, SymTable *ctxt)
  {
! 	const char *tstr;
! 	Var *v;
! 	char paren;
! 	const char *str = *pstr;
  	const char *start;
  	size_t length;
  	struct Name name;
+ 	bool result;
  
  	v = NULL;
  	start = str;
***************
*** 849,862 ****
  			length++;
  	}
  
! 	if (result != NULL)
! 		*result = true;
  	if (*tstr == ':' && paren != '\0')
  		 if (VarModifiers_Apply(NULL, NULL, ctxt, true, NULL, tstr,
  		    paren, &length) == var_Error)
! 			if (result != NULL)
! 				*result = false;
! 	return length;
  }
  
  /* As of now, Var_ParseBuffer is just a wrapper around Var_Parse. For
--- 851,863 ----
  			length++;
  	}
  
! 	result = true;
  	if (*tstr == ':' && paren != '\0')
  		 if (VarModifiers_Apply(NULL, NULL, ctxt, true, NULL, tstr,
  		    paren, &length) == var_Error)
! 			result = false;
! 	*pstr += length;
! 	return result;
  }
  
  /* As of now, Var_ParseBuffer is just a wrapper around Var_Parse. For