From: Alejandro Colomar Date: Fri, 13 Mar 2026 00:16:26 +0000 (+0100) Subject: lib/: Merge "lib/string/ctype/*" files even further X-Git-Tag: 4.20.0-rc1~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbaa86191d490f2443590e1c4b4cd5e19f98cf95;p=thirdparty%2Fshadow.git lib/: Merge "lib/string/ctype/*" files even further Most of these are just one-liners, so they fit in less files, and that makes them even easier to compare all at once. Signed-off-by: Alejandro Colomar --- diff --git a/lib/Makefile.am b/lib/Makefile.am index 69bbd14db..599cb0bbd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -193,12 +193,8 @@ libshadow_la_SOURCES = \ sssd.h \ string/ctype/isascii.c \ string/ctype/isascii.h \ - string/ctype/strchrisascii.c \ - string/ctype/strchrisascii.h \ - string/ctype/strisascii.c \ - string/ctype/strisascii.h \ - string/ctype/strtoascii.c \ - string/ctype/strtoascii.h \ + string/ctype/toascii.c \ + string/ctype/toascii.h \ string/memset/memzero.c \ string/memset/memzero.h \ string/sprintf/aprintf.c \ diff --git a/lib/chkname.c b/lib/chkname.c index 85735d9c5..1ef33ad3e 100644 --- a/lib/chkname.c +++ b/lib/chkname.c @@ -33,8 +33,7 @@ #include "defines.h" #include "chkname.h" -#include "string/ctype/strchrisascii.h" -#include "string/ctype/strisascii.h" +#include "string/ctype/isascii.h" #include "string/strcmp/streq.h" #include "string/strcmp/strcaseeq.h" #include "sysconf.h" diff --git a/lib/fields.c b/lib/fields.c index 6f0d77abc..568746fc8 100644 --- a/lib/fields.c +++ b/lib/fields.c @@ -19,8 +19,7 @@ #include "io/fgets/fgets.h" #include "prototypes.h" -#include "string/ctype/strisascii.h" -#include "string/ctype/strchrisascii.h" +#include "string/ctype/isascii.h" #include "string/strcmp/streq.h" #include "string/strspn/stpspn.h" #include "string/strspn/stprspn.h" diff --git a/lib/obscure.c b/lib/obscure.c index 3f0a4ca66..342bb812d 100644 --- a/lib/obscure.c +++ b/lib/obscure.c @@ -19,7 +19,7 @@ #include "prototypes.h" #include "defines.h" #include "getdef.h" -#include "string/ctype/strtoascii.h" +#include "string/ctype/toascii.h" #include "string/memset/memzero.h" #include "string/sprintf/aprintf.h" #include "string/strcmp/streq.h" diff --git a/lib/string/ctype/isascii.h b/lib/string/ctype/isascii.h index 8a1b47fcf..6500717c6 100644 --- a/lib/string/ctype/isascii.h +++ b/lib/string/ctype/isascii.h @@ -11,6 +11,7 @@ #include #include "string/strcmp/streq.h" +#include "string/strspn/stpspn.h" #define CTYPE_CNTRL_C \ @@ -46,4 +47,13 @@ #define isxdigit_c(c) (!streq(strchrnul(CTYPE_XDIGIT_C, c), "")) +// strisascii_c - string is [:ascii:] C-locale +#define strisdigit_c(s) streq(stpspn(s, CTYPE_DIGIT_C), "") +#define strisprint_c(s) streq(stpspn(s, CTYPE_PRINT_C), "") + + +// strchriscntrl_c - string character is [:cntrl:] C-locale +#define strchriscntrl_c(s) (!!strpbrk(s, CTYPE_CNTRL_C)) + + #endif // include guard diff --git a/lib/string/ctype/strchrisascii.c b/lib/string/ctype/strchrisascii.c deleted file mode 100644 index 905430628..000000000 --- a/lib/string/ctype/strchrisascii.c +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-FileCopyrightText: 2024, Alejandro Colomar -// SPDX-License-Identifier: BSD-3-Clause - - -#include "config.h" - -#include "string/ctype/strchrisascii.h" diff --git a/lib/string/ctype/strchrisascii.h b/lib/string/ctype/strchrisascii.h deleted file mode 100644 index 8fc775a8c..000000000 --- a/lib/string/ctype/strchrisascii.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-FileCopyrightText: 2024-2026, Alejandro Colomar -// SPDX-License-Identifier: BSD-3-Clause - - -#ifndef SHADOW_INCLUDE_LIB_STRING_CTYPE_STRCHRISASCII_H_ -#define SHADOW_INCLUDE_LIB_STRING_CTYPE_STRCHRISASCII_H_ - - -#include "config.h" - -#include - -#include "string/ctype/isascii.h" - - -// strchriscntrl_c - string character is [:cntrl:] C-locale -#define strchriscntrl_c(s) (!!strpbrk(s, CTYPE_CNTRL_C)) - - -#endif // include guard diff --git a/lib/string/ctype/strisascii.c b/lib/string/ctype/strisascii.c deleted file mode 100644 index 24e8a9cbb..000000000 --- a/lib/string/ctype/strisascii.c +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-FileCopyrightText: 2024-2025, Alejandro Colomar -// SPDX-License-Identifier: BSD-3-Clause - - -#include "config.h" - -#include "string/ctype/strisascii.h" diff --git a/lib/string/ctype/strisascii.h b/lib/string/ctype/strisascii.h deleted file mode 100644 index eb4d831bb..000000000 --- a/lib/string/ctype/strisascii.h +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-FileCopyrightText: 2024-2025, Alejandro Colomar -// SPDX-License-Identifier: BSD-3-Clause - - -#ifndef SHADOW_INCLUDE_LIB_STRING_CTYPE_STRISASCII_H_ -#define SHADOW_INCLUDE_LIB_STRING_CTYPE_STRISASCII_H_ - - -#include "config.h" - -#include "string/ctype/isascii.h" -#include "string/strcmp/streq.h" -#include "string/strspn/stpspn.h" - - -// strisascii_c - string is [:ascii:] C-locale -#define strisdigit_c(s) streq(stpspn(s, CTYPE_DIGIT_C), "") -#define strisprint_c(s) streq(stpspn(s, CTYPE_PRINT_C), "") - - -#endif // include guard diff --git a/lib/string/ctype/strtoascii.c b/lib/string/ctype/toascii.c similarity index 82% rename from lib/string/ctype/strtoascii.c rename to lib/string/ctype/toascii.c index 1e89acaaf..5f8cc0c7b 100644 --- a/lib/string/ctype/strtoascii.c +++ b/lib/string/ctype/toascii.c @@ -4,7 +4,7 @@ #include "config.h" -#include "string/ctype/strtoascii.h" +#include "string/ctype/toascii.h" extern inline char *strtolower(char *str); diff --git a/lib/string/ctype/strtoascii.h b/lib/string/ctype/toascii.h similarity index 80% rename from lib/string/ctype/strtoascii.h rename to lib/string/ctype/toascii.h index c0c3be717..440a24222 100644 --- a/lib/string/ctype/strtoascii.h +++ b/lib/string/ctype/toascii.h @@ -2,8 +2,8 @@ // SPDX-License-Identifier: BSD-3-Clause -#ifndef SHADOW_INCLUDE_LIB_STRING_CTYPE_STRTOASCII_H_ -#define SHADOW_INCLUDE_LIB_STRING_CTYPE_STRTOASCII_H_ +#ifndef SHADOW_INCLUDE_LIB_STRING_CTYPE_TOASCII_H_ +#define SHADOW_INCLUDE_LIB_STRING_CTYPE_TOASCII_H_ #include "config.h" diff --git a/lib/subordinateio.c b/lib/subordinateio.c index dacfe2015..65bcfb707 100644 --- a/lib/subordinateio.c +++ b/lib/subordinateio.c @@ -24,7 +24,7 @@ #include "atoi/a2i.h" #include "atoi/getnum.h" #include "shadow/passwd/getpw.h" -#include "string/ctype/strisascii.h" +#include "string/ctype/isascii.h" #include "string/sprintf/stprintf.h" #include "string/strcmp/streq.h" #include "string/strtok/strsep2arr.h"