Tue Sep 21 22:53:35 2021 UTC ()

make: reduce relocations and thereby .text size, make opname const

No functional change.


(rillig)

diff -r1.277 -r1.278 src/usr.bin/make/cond.c

--- src/usr.bin/make/cond.c 2021/09/21 22:48:04	1.277
+++ src/usr.bin/make/cond.c 2021/09/21 22:53:35	1.278

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cond.c,v 1.277 2021/09/21 22:48:04 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.278 2021/09/21 22:53:35 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -85,27 +85,27 @@
  *	Cond_restore_depth
  *			Save and restore the nesting of the conditions, at
  *			the start and end of including another makefile, to
  *			ensure that in each makefile the conditional
  *			directives are well-balanced.
  */
 #include <errno.h>
 #include "make.h"
 #include "dir.h"
 /*	"@(#)cond.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: cond.c,v 1.277 2021/09/21 22:48:04 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.278 2021/09/21 22:53:35 rillig Exp $");
 /*
  * The parsing of conditional expressions is based on this grammar:
  *	Or -> And
  *	Or -> Or '||' And
  *	And -> Term
  *	And -> And '&&' Term
  *	Term -> Function '(' Argument ')'
  *	Term -> Leaf Operator Leaf
  *	Term -> Leaf
  *	Term -> '(' Or ')'
  *	Term -> '!' Term
  *	Leaf -> "string"
 @@ -176,27 +176,27 @@ typedef struct CondParser {
 	 * condition. The first available error message is usually the most
 	 * specific one, therefore it makes sense to suppress the standard
 	 * "Malformed conditional" message.
 	 */
 	bool printedError;
 } CondParser;
 static CondResult CondParser_Or(CondParser *par, bool);
 static unsigned int cond_depth = 0;	/* current .if nesting level */
 static unsigned int cond_min_depth = 0;	/* depth at makefile open */
 /* Names for ComparisonOp. */
-static const char *opname[] = { "<", "<=", ">", ">=", "==", "!=" };
+static const char opname[][3] = { "<", "<=", ">", ">=", "==", "!=" };
 static bool
 is_token(const char *str, const char *tok, size_t len)
+{
 	return strncmp(str, tok, len) == 0 && !ch_isalpha(str[len]);
+}
 static Token
 ToToken(bool cond)
+{
 	return cond ? TOK_TRUE : TOK_FALSE;
+}