lib/: Treat strpbrk(3)'s return value as a boolean

with the meaning "a character was found". strpbrk(3) is just like strchr(3), but searches for multiple characters. Both functions have a boolean-like return value, which evaluates to true if a character was found. A better name for strpbrk(3) would have been strchrs(). Signed-off-by: Alejandro Colomar <[email protected]>
alejandro-colomar · Feb 16, 2025 · 37771da · 37771da
1 parent 915f7fc
commit 37771da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/fields.c b/lib/fields.c
@@ -43,7 +43,7 @@ int valid_field (const char *field, const char *illegal)
 
 	/* For each character of field, search if it appears in the list
 	 * of illegal characters. */
-	if (illegal && NULL != strpbrk (field, illegal)) {
+	if (illegal && strpbrk(field, illegal)) {
 		return -1;
 	}
 

diff --git a/lib/setupenv.c b/lib/setupenv.c
@@ -72,7 +72,7 @@ static void read_env_file (const char *filename)
 		val = stpsep(cp, "=");
 		if (val == NULL)
 			continue;
-		if (strpbrk(name, " \t") != NULL)
+		if (strpbrk(name, " \t"))
 			continue;
 #if 0				/* XXX untested, and needs rewrite with fewer goto's :-) */
 /*