From: Alejandro Colomar Date: Fri, 17 Oct 2025 00:02:56 +0000 (+0200) Subject: lib/atoi/, */: Move all str2i() macros together with a2i() X-Git-Tag: 4.19.0-rc1~85 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38499ca52975fef2e94685d01bbb015e01872446;p=thirdparty%2Fshadow.git lib/atoi/, */: Move all str2i() macros together with a2i() Signed-off-by: Alejandro Colomar --- diff --git a/lib/Makefile.am b/lib/Makefile.am index 30bc0526d..798262500 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -41,8 +41,6 @@ libshadow_la_SOURCES = \ atoi/a2i.h \ atoi/getnum.c \ atoi/getnum.h \ - atoi/str2i.c \ - atoi/str2i.h \ atoi/strtoi/strtoi.c \ atoi/strtoi/strtoi.h \ atoi/strtoi/strtou.c \ diff --git a/lib/atoi/a2i.h b/lib/atoi/a2i.h index 1c16f9ba5..74a34a282 100644 --- a/lib/atoi/a2i.h +++ b/lib/atoi/a2i.h @@ -9,6 +9,7 @@ #include "config.h" #include +#include #include "atoi/strtoi/strtoi.h" #include "atoi/strtoi/strtou_noneg.h" @@ -52,5 +53,17 @@ #define a2ul(...) a2i(unsigned long, __VA_ARGS__) #define a2ull(...) a2i(unsigned long long, __VA_ARGS__) +#define str2i(T, ...) a2i(T, __VA_ARGS__, NULL, 0, type_min(T), type_max(T)) + +#define str2sh(...) str2i(short, __VA_ARGS__) +#define str2si(...) str2i(int, __VA_ARGS__) +#define str2sl(...) str2i(long, __VA_ARGS__) +#define str2sll(...) str2i(long long, __VA_ARGS__) + +#define str2uh(...) str2i(unsigned short, __VA_ARGS__) +#define str2ui(...) str2i(unsigned int, __VA_ARGS__) +#define str2ul(...) str2i(unsigned long, __VA_ARGS__) +#define str2ull(...) str2i(unsigned long long, __VA_ARGS__) + #endif // include guard diff --git a/lib/atoi/str2i.c b/lib/atoi/str2i.c deleted file mode 100644 index 3beee6fa4..000000000 --- a/lib/atoi/str2i.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-FileCopyrightText: 2007-2009, Nicolas François -// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar -// SPDX-License-Identifier: BSD-3-Clause - - -#include "config.h" - -#include "atoi/str2i.h" diff --git a/lib/atoi/str2i.h b/lib/atoi/str2i.h deleted file mode 100644 index 2061d8f87..000000000 --- a/lib/atoi/str2i.h +++ /dev/null @@ -1,31 +0,0 @@ -// SPDX-FileCopyrightText: 2007-2009, Nicolas François -// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar -// SPDX-License-Identifier: BSD-3-Clause - - -#ifndef SHADOW_INCLUDE_LIB_ATOI_STR2I_H_ -#define SHADOW_INCLUDE_LIB_ATOI_STR2I_H_ - - -#include "config.h" - -#include - -#include "atoi/a2i.h" -#include "typetraits.h" - - -#define str2i(T, ...) a2i(T, __VA_ARGS__, NULL, 0, type_min(T), type_max(T)) - -#define str2sh(...) str2i(short, __VA_ARGS__) -#define str2si(...) str2i(int, __VA_ARGS__) -#define str2sl(...) str2i(long, __VA_ARGS__) -#define str2sll(...) str2i(long long, __VA_ARGS__) - -#define str2uh(...) str2i(unsigned short, __VA_ARGS__) -#define str2ui(...) str2i(unsigned int, __VA_ARGS__) -#define str2ul(...) str2i(unsigned long, __VA_ARGS__) -#define str2ull(...) str2i(unsigned long long, __VA_ARGS__) - - -#endif // include guard diff --git a/lib/getdef.c b/lib/getdef.c index 9bcba20dc..765cddfa1 100644 --- a/lib/getdef.c +++ b/lib/getdef.c @@ -23,7 +23,6 @@ #endif #include "atoi/a2i.h" -#include "atoi/str2i.h" #include "defines.h" #include "getdef.h" #include "prototypes.h" diff --git a/lib/limits.c b/lib/limits.c index 136e5e31c..b806e3ca8 100644 --- a/lib/limits.c +++ b/lib/limits.c @@ -31,7 +31,6 @@ #include #include "atoi/a2i.h" -#include "atoi/str2i.h" #include "string/memset/memzero.h" #include "string/strcmp/streq.h" #include "string/strcmp/strprefix.h" diff --git a/lib/shadow/shadow/sgetspent.c b/lib/shadow/shadow/sgetspent.c index 7ad2ede0b..bd778cdc1 100644 --- a/lib/shadow/shadow/sgetspent.c +++ b/lib/shadow/shadow/sgetspent.c @@ -19,7 +19,6 @@ #include #include "atoi/a2i.h" -#include "atoi/str2i.h" #include "defines.h" #include "prototypes.h" #include "shadowlog_internal.h" diff --git a/lib/strtoday.c b/lib/strtoday.c index 8d92f539d..5f0927331 100644 --- a/lib/strtoday.c +++ b/lib/strtoday.c @@ -12,7 +12,7 @@ #include #include -#include "atoi/str2i.h" +#include "atoi/a2i.h" #include "defines.h" #include "prototypes.h" #include "string/strcmp/streq.h" diff --git a/lib/subordinateio.c b/lib/subordinateio.c index 0ceeecafd..0a6835e75 100644 --- a/lib/subordinateio.c +++ b/lib/subordinateio.c @@ -22,7 +22,7 @@ #include "alloc/malloc.h" #include "alloc/realloc.h" #include "alloc/reallocf.h" -#include "atoi/str2i.h" +#include "atoi/a2i.h" #include "string/ctype/strisascii/strisdigit.h" #include "string/sprintf/snprintf.h" #include "string/strcmp/streq.h" diff --git a/src/check_subid_range.c b/src/check_subid_range.c index 8f6e474a2..f8d620d0d 100644 --- a/src/check_subid_range.c +++ b/src/check_subid_range.c @@ -12,8 +12,8 @@ #include #include +#include "atoi/a2i.h" #include "atoi/getnum.h" -#include "atoi/str2i.h" #include "defines.h" #include "idmapping.h" #include "prototypes.h" diff --git a/src/chgpasswd.c b/src/chgpasswd.c index 577ae8b75..0e6f5719f 100644 --- a/src/chgpasswd.c +++ b/src/chgpasswd.c @@ -23,7 +23,7 @@ #include "pam_defs.h" #endif /* USE_PAM */ #endif /* ACCT_TOOLS_SETUID */ -#include "atoi/str2i.h" +#include "atoi/a2i.h" #include "defines.h" #include "nscd.h" #include "sssd.h" diff --git a/src/chpasswd.c b/src/chpasswd.c index e1805e329..b67fc9f6b 100644 --- a/src/chpasswd.c +++ b/src/chpasswd.c @@ -22,7 +22,7 @@ #ifdef USE_PAM #include "pam_defs.h" #endif /* USE_PAM */ -#include "atoi/str2i.h" +#include "atoi/a2i.h" #include "chkhash.h" #include "defines.h" #include "nscd.h" diff --git a/src/faillog.c b/src/faillog.c index 2800e93e3..f1a0dd1c6 100644 --- a/src/faillog.c +++ b/src/faillog.c @@ -19,7 +19,7 @@ #include #include -#include "atoi/str2i.h" +#include "atoi/a2i.h" #include "defines.h" #include "faillog.h" #include "prototypes.h" diff --git a/src/free_subid_range.c b/src/free_subid_range.c index 4bdacfb7d..c3e94d5dc 100644 --- a/src/free_subid_range.c +++ b/src/free_subid_range.c @@ -4,7 +4,7 @@ #include #include -#include "atoi/str2i.h" +#include "atoi/a2i.h" #include "subid.h" #include "stdlib.h" #include "prototypes.h" diff --git a/src/lastlog.c b/src/lastlog.c index 6fafc90b0..dbdd85930 100644 --- a/src/lastlog.c +++ b/src/lastlog.c @@ -24,7 +24,7 @@ #include #endif -#include "atoi/str2i.h" +#include "atoi/a2i.h" #include "defines.h" #include "prototypes.h" #include "getdef.h" diff --git a/src/new_subid_range.c b/src/new_subid_range.c index 6be957409..e423b1aba 100644 --- a/src/new_subid_range.c +++ b/src/new_subid_range.c @@ -3,7 +3,7 @@ #include #include -#include "atoi/str2i.h" +#include "atoi/a2i.h" #include "subid.h" #include "stdlib.h" #include "prototypes.h" diff --git a/src/newusers.c b/src/newusers.c index 3f260584d..70e9eb7d7 100644 --- a/src/newusers.c +++ b/src/newusers.c @@ -33,8 +33,8 @@ #include #include "alloc/reallocf.h" +#include "atoi/a2i.h" #include "atoi/getnum.h" -#include "atoi/str2i.h" #ifdef ACCT_TOOLS_SETUID #ifdef USE_PAM #include "pam_defs.h"