Module Name: src
Committed By: sjg
Date: Fri Jun 20 06:13:45 UTC 2014
Modified Files:
src/usr.bin/make: var.c
Log Message:
Return varNoError rather than var_Error for ::?= etc.
To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.185 src/usr.bin/make/var.c:1.186
--- src/usr.bin/make/var.c:1.185 Mon May 19 22:09:58 2014
+++ src/usr.bin/make/var.c Fri Jun 20 06:13:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.185 2014/05/19 22:09:58 sjg Exp $ */
+/* $NetBSD: var.c,v 1.186 2014/06/20 06:13:45 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.185 2014/05/19 22:09:58 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.186 2014/06/20 06:13:45 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.185 2014/05/19 22:09:58 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.186 2014/06/20 06:13:45 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -2636,7 +2636,7 @@ ApplyModifiers(char *nstr, const char *t
break;
}
free(UNCONST(pattern.rhs));
- newStr = var_Error;
+ newStr = varNoError;
break;
}
goto default_case; /* "::<unrecognised>" */
