diff options
| author | rillig <rillig@NetBSD.org> | 2020-08-31 16:44:25 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2020-08-31 16:44:25 +0000 |
| commit | 7e730689a2d7eb216b5ba30ca3d3183bdb1cfbc4 (patch) | |
| tree | e1def9aa57d302f93d845051e142c892557d5f70 /usr.bin/make/suff.c | |
| parent | 57800038f5dfa38cb2d9b764a9e1ccf5419f5fa3 (diff) | |
make(1): fix compilation for -DNDEBUG and -O3
The -O3 option of GCC 5.5 is unsure about whether s and t are always
defined, since SuffParseTransform only defines them if it returns TRUE.
Therefore assert that it does. When compiled with -NDEBUG, this would
result in an unused variable, therefore use it using the well-known
cast-to-void pattern.
Diffstat (limited to 'usr.bin/make/suff.c')
| -rw-r--r-- | usr.bin/make/suff.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c index 953b55d5c9a..bcab3027e6d 100644 --- a/usr.bin/make/suff.c +++ b/usr.bin/make/suff.c @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.141 2020/08/31 05:56:02 rillig Exp $ */ +/* $NetBSD: suff.c,v 1.142 2020/08/31 16:44:25 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: suff.c,v 1.141 2020/08/31 05:56:02 rillig Exp $"; +static char rcsid[] = "$NetBSD: suff.c,v 1.142 2020/08/31 16:44:25 rillig Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; #else -__RCSID("$NetBSD: suff.c,v 1.141 2020/08/31 05:56:02 rillig Exp $"); +__RCSID("$NetBSD: suff.c,v 1.142 2020/08/31 16:44:25 rillig Exp $"); #endif #endif /* not lint */ #endif @@ -567,6 +567,7 @@ Suff_AddTransform(char *line) Suff *s, /* source suffix */ *t; /* target suffix */ LstNode ln; /* Node for existing transformation */ + Boolean ok; ln = Lst_Find(transforms, SuffGNHasName, line); if (ln == NULL) { @@ -592,7 +593,9 @@ Suff_AddTransform(char *line) gn->type = OP_TRANSFORM; - (void)SuffParseTransform(line, &s, &t); + ok = SuffParseTransform(line, &s, &t); + assert(ok); + (void)ok; /* * link the two together in the proper relationship and order |
