From: Alejandro Colomar <alx@kernel.org>
Date: Fri, 2 Jan 2026 23:37:18 +0000 (+0100)
Subject: lib/string/ctype/strchrisascii.h: Use strpbrk(3) to simplify
X-Git-Tag: 4.20.0-rc1~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7dc6faea6426ffc4a4c11d56e3df1e6c19a09a5;p=thirdparty%2Fshadow.git

lib/string/ctype/strchrisascii.h: Use strpbrk(3) to simplify

This compacts it into a one-liner, more similar to the strisascii_c()
functions.

Since we only use the argument once, we can even turn this into a macro.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/string/ctype/strchrisascii.c b/lib/string/ctype/strchrisascii.c
index 5e25b23fa..905430628 100644
--- a/lib/string/ctype/strchrisascii.c
+++ b/lib/string/ctype/strchrisascii.c
@@ -5,8 +5,3 @@
 #include "config.h"
 
 #include "string/ctype/strchrisascii.h"
-
-#include <stdbool.h>
-
-
-extern inline bool strchriscntrl_c(const char *s);
diff --git a/lib/string/ctype/strchrisascii.h b/lib/string/ctype/strchrisascii.h
index 04da16e9d..8fc775a8c 100644
--- a/lib/string/ctype/strchrisascii.h
+++ b/lib/string/ctype/strchrisascii.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024-2025, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2024-2026, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
@@ -8,28 +8,13 @@
 
 #include "config.h"
 
-#include <stdbool.h>
+#include <string.h>
 
 #include "string/ctype/isascii.h"
-#include "string/strcmp/streq.h"
-
-
-inline bool strchriscntrl_c(const char *s);
 
 
 // strchriscntrl_c - string character is [:cntrl:] C-locale
-inline bool
-strchriscntrl_c(const char *s)
-{
-	for (; !streq(s, ""); s++) {
-		unsigned char  c = *s;
-
-		if (iscntrl_c(c))
-			return true;
-	}
-
-	return false;
-}
+#define strchriscntrl_c(s)  (!!strpbrk(s, CTYPE_CNTRL_C))
 
 
 #endif  // include guard