lib/atoi/, */: Move all str2i() macros together with a2i()

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 30bc0526d975f747ce4d6a2bb5fc3d8a32caf628..798262500531690f03eb0bfc5c63bcdd144aac93 100644 (file)
--- 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 1c16f9ba515ccbe42e9fe6182216b6f4f8cb3974..74a34a282c0a79b4adfbbe4d772d59ac16a9ca88 100644 (file)
--- a/lib/atoi/a2i.h
+++ b/lib/atoi/a2i.h
@@ -9,6 +9,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <stddef.h>
 
 #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 (file)
index 3beee6f..0000000
--- a/lib/atoi/str2i.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: 2007-2009, Nicolas François
-// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
-// 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 (file)
index 2061d8f..0000000
--- a/lib/atoi/str2i.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: 2007-2009, Nicolas François
-// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_STR2I_H_
-#define SHADOW_INCLUDE_LIB_ATOI_STR2I_H_
-
-
-#include "config.h"
-
-#include <stddef.h>
-
-#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 9bcba20dc2258290bd5b7a7e397b342be5c39b57..765cddfa19963f9922ef4db08f834da6e6d371fe 100644 (file)
--- 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 136e5e31c39b74386deaff11d8ecd35e2b28e529..b806e3ca8c2b26e9c6295a95e70ea8b4f1d7b076 100644 (file)
--- a/lib/limits.c
+++ b/lib/limits.c
@@ -31,7 +31,6 @@
 #include <sys/resource.h>
 
 #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 7ad2ede0ba0f6df57641e7da6968a43bc79ab4c4..bd778cdc1dac05a8926e68c11cd8666ec9201184 100644 (file)
--- a/lib/shadow/shadow/sgetspent.c
+++ b/lib/shadow/shadow/sgetspent.c
@@ -19,7 +19,6 @@
 #include <string.h>
 
 #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 8d92f539db2929afc456856dacf306d35d2b502a..5f0927331669a0ab84170a43fe33cd4604a7777f 100644 (file)
--- a/lib/strtoday.c
+++ b/lib/strtoday.c
@@ -12,7 +12,7 @@
 #include <stddef.h>
 #include <time.h>
 
-#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 0ceeecafd43cae3acf42b3f8f97a6d2277677eb5..0a6835e75666266d4d66caf6d69841b8244aec6c 100644 (file)
--- 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 8f6e474a2817be80a8016680a810712a8705b782..f8d620d0dd22c510f8d61d0e9ee2d336d004969e 100644 (file)
--- a/src/check_subid_range.c
+++ b/src/check_subid_range.c
@@ -12,8 +12,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#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 577ae8b750d2ca89f00baa36c6efdf1df26c4e2a..0e6f5719fb5719dc088b9b8a6b5c461260450b62 100644 (file)
--- 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 e1805e3297ada2a2809bcfc4ebccdeb6282752d9..b67fc9f6b6e8a54a8f68a103537f6a4ce11ad7f0 100644 (file)
--- 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 2800e93e3594ec9b08fa8c2c8a2d78dbe4fb600f..f1a0dd1c6787695262104faebc3dc23493a04ba3 100644 (file)
--- a/src/faillog.c
+++ b/src/faillog.c
@@ -19,7 +19,7 @@
 #include <time.h>
 #include <assert.h>
 
-#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 4bdacfb7dc76673617ab9478f00505f59f6bf303..c3e94d5dc4d8d54c729efece66b66a312392d45f 100644 (file)
--- a/src/free_subid_range.c
+++ b/src/free_subid_range.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#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 6fafc90b0807fdb28eb191134dd781adacbb3133..dbdd859309b1e3e0b971e2388ce44d95c13e74af 100644 (file)
--- a/src/lastlog.c
+++ b/src/lastlog.c
@@ -24,7 +24,7 @@
 #include <net/if.h>
 #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 6be957409c9d1857674bd26bfbba1a85e2ab8ab5..e423b1aba5eb80d892b64c8eb4e9454f21070d62 100644 (file)
--- a/src/new_subid_range.c
+++ b/src/new_subid_range.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#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 3f260584d99d60f9bcaeadb738fa7ca0d37ed772..70e9eb7d77e8c52816310a3233065c712015ae05 100644 (file)
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -33,8 +33,8 @@
 #include <string.h>
 
 #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"