Module Name: src
Committed By: rillig
Date: Thu Aug 13 20:13:46 UTC 2020
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make(1): fix type mismatch in compare_expression
This was caught by a simple "typedef double Boolean" in sprite.h.
If only there were a C compiler with "strict" mode, where pointers,
numbers and booleans were separate and unassignable data types, this
copy-and-paste typo would have been caught much earlier.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/usr.bin/make/cond.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/cond.c
diff -u src/usr.bin/make/cond.c:1.94 src/usr.bin/make/cond.c:1.95
--- src/usr.bin/make/cond.c:1.94 Thu Aug 13 19:30:37 2020
+++ src/usr.bin/make/cond.c Thu Aug 13 20:13:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.94 2020/08/13 19:30:37 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.95 2020/08/13 20:13:46 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.94 2020/08/13 19:30:37 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.95 2020/08/13 20:13:46 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: cond.c,v 1.94 2020/08/13 19:30:37 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.95 2020/08/13 20:13:46 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -531,7 +531,7 @@ compare_expression(Boolean doEval)
t = TOK_ERROR;
rhs = NULL;
- lhsFree = rhsFree = FALSE;
+ lhsFree = rhsFree = NULL;
lhsQuoted = rhsQuoted = FALSE;
/*
