Sat Oct 31 23:44:42 2020 UTC ()

make(1): clean up StrContainsWord


(rillig)

diff -r1.418 -r1.419 src/usr.bin/make/parse.c

--- src/usr.bin/make/parse.c 2020/10/31 23:39:01	1.418
+++ src/usr.bin/make/parse.c 2020/10/31 23:44:42	1.419

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.418 2020/10/31 23:39:01 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.419 2020/10/31 23:44:42 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	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.
 @@ -107,27 +107,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.418 2020/10/31 23:39:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.419 2020/10/31 23:44:42 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
     char *fname;		/* name of file */
     Boolean fromForLoop;	/* simulated .include by the .for loop */
     int lineno;			/* current line number in file */
     int first_lineno;		/* line number of start of text */
     unsigned int cond_depth;	/* 'if' nesting when file opened */
     Boolean depending;		/* state of doing_depend on EOF */
 @@ -2344,43 +2344,42 @@ ParseSetParseFile(const char *filename)
     including = GetActuallyIncludingFile();
     if (including != NULL) {
 	SetFilenameVars(including,
 			".INCLUDEDFROMDIR", ".INCLUDEDFROMFILE");
     } else {
 	Var_Delete(".INCLUDEDFROMDIR", VAR_GLOBAL);
 	Var_Delete(".INCLUDEDFROMFILE", VAR_GLOBAL);
+    }
+}
 static Boolean
 StrContainsWord(const char *str, const char *word)
+{
-    const char *val = str;
+    size_t strLen = strlen(str);
     size_t valLen = strlen(val);
     size_t wordLen = strlen(word);
-    const char *end;
+    const char *p, *end;
-    if (valLen < wordLen)
+    if (strLen < wordLen)
 	return FALSE;		/* str is too short to contain word */
-    end = val + valLen - wordLen;
+    end = str + strLen - wordLen;
-    for (; val != NULL; val = strchr(val, ' ')) {
+    for (p = str; p != NULL; p = strchr(p, ' ')) {
-	if (*val == ' ')
+	if (*p == ' ')
-	    val++;
+	    p++;
-	if (val > end)
+	if (p > end)
 	    return FALSE;	/* cannot contain word */
-	if (memcmp(val, word, wordLen) == 0 &&
+	if (memcmp(p, word, wordLen) == 0 &&
-	    (val[wordLen] == '\0' || val[wordLen] == ' '))
+	    (p[wordLen] == '\0' || p[wordLen] == ' '))
 	    return TRUE;
+    }
     return FALSE;
+}
 /* XXX: Searching through a set of words with this linear search is
  * inefficient for variables that contain thousands of words. */
 static Boolean
 VarContainsWord(const char *varname, const char *word)
+{
     void *val_freeIt;
     const char *val = Var_Value(varname, VAR_GLOBAL, &val_freeIt);
     Boolean found = val != NULL && StrContainsWord(val, word);