lib/atoi/, */: Move all a2i() macros to the same file

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 60c4948d80067b7504195b190b78ab4713a7d449..30bc0526d975f747ce4d6a2bb5fc3d8a32caf628 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -37,20 +37,8 @@ libshadow_la_SOURCES = \
        alloc/realloc.h \
        alloc/reallocf.c \
        alloc/reallocf.h \
-       atoi/a2i/a2i.c \
-       atoi/a2i/a2i.h \
-       atoi/a2i/a2s.c \
-       atoi/a2i/a2s.h \
-       atoi/a2i/a2s_c.c \
-       atoi/a2i/a2s_c.h \
-       atoi/a2i/a2s_nc.c \
-       atoi/a2i/a2s_nc.h \
-       atoi/a2i/a2u.c \
-       atoi/a2i/a2u.h \
-       atoi/a2i/a2u_c.c \
-       atoi/a2i/a2u_c.h \
-       atoi/a2i/a2u_nc.c \
-       atoi/a2i/a2u_nc.h \
+       atoi/a2i.c \
+       atoi/a2i.h \
        atoi/getnum.c \
        atoi/getnum.h \
        atoi/str2i.c \

diff --git a/lib/atoi/a2i.c b/lib/atoi/a2i.c
new file mode 100644 (file)
index 0000000..6bbbf7b
--- /dev/null
+++ b/lib/atoi/a2i.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include "config.h"
+
+#include "atoi/a2i.h"

diff --git a/lib/atoi/a2i/a2i.h b/lib/atoi/a2i.h
similarity index 79%
rename from lib/atoi/a2i/a2i.h
rename to lib/atoi/a2i.h
index 3533648b6b1e217a2ee2af0e21ae181c46b4e1c3..1c16f9ba515ccbe42e9fe6182216b6f4f8cb3974 100644 (file)
--- a/lib/atoi/a2i/a2i.h
+++ b/lib/atoi/a2i.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2I_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2I_H_
+#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_H_
+#define SHADOW_INCLUDE_LIB_ATOI_A2I_H_
 
 
 #include "config.h"
@@ -42,4 +42,15 @@
 })
 
 
+#define a2sh(...)   a2i(short, __VA_ARGS__)
+#define a2si(...)   a2i(int, __VA_ARGS__)
+#define a2sl(...)   a2i(long, __VA_ARGS__)
+#define a2sll(...)  a2i(long long, __VA_ARGS__)
+
+#define a2uh(...)   a2i(unsigned short, __VA_ARGS__)
+#define a2ui(...)   a2i(unsigned int, __VA_ARGS__)
+#define a2ul(...)   a2i(unsigned long, __VA_ARGS__)
+#define a2ull(...)  a2i(unsigned long long, __VA_ARGS__)
+
+
 #endif  // include guard

diff --git a/lib/atoi/a2i/a2i.c b/lib/atoi/a2i/a2i.c
deleted file mode 100644 (file)
index f57a034..0000000
--- a/lib/atoi/a2i/a2i.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include "config.h"
-
-#include "atoi/a2i/a2i.h"

diff --git a/lib/atoi/a2i/a2s.c b/lib/atoi/a2i/a2s.c
deleted file mode 100644 (file)
index 8bf15d0..0000000
--- a/lib/atoi/a2i/a2s.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include "config.h"
-
-#include "atoi/a2i/a2s.h"

diff --git a/lib/atoi/a2i/a2s.h b/lib/atoi/a2i/a2s.h
deleted file mode 100644 (file)
index c6f6a3d..0000000
--- a/lib/atoi/a2i/a2s.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_H_
-
-
-#include "config.h"
-
-#include "atoi/a2i/a2i.h"
-
-
-#define a2sh(...)   a2i(short, __VA_ARGS__)
-#define a2si(...)   a2i(int, __VA_ARGS__)
-#define a2sl(...)   a2i(long, __VA_ARGS__)
-#define a2sll(...)  a2i(long long, __VA_ARGS__)
-
-
-#endif  // include guard

diff --git a/lib/atoi/a2i/a2u.c b/lib/atoi/a2i/a2u.c
deleted file mode 100644 (file)
index a2f35ad..0000000
--- a/lib/atoi/a2i/a2u.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include "config.h"
-
-#include "atoi/a2i/a2u.h"

diff --git a/lib/atoi/a2i/a2u.h b/lib/atoi/a2i/a2u.h
deleted file mode 100644 (file)
index 8b21646..0000000
--- a/lib/atoi/a2i/a2u.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_H_
-
-
-#include "config.h"
-
-#include "atoi/a2i/a2i.h"
-
-
-#define a2uh(...)   a2i(unsigned short, __VA_ARGS__)
-#define a2ui(...)   a2i(unsigned int, __VA_ARGS__)
-#define a2ul(...)   a2i(unsigned long, __VA_ARGS__)
-#define a2ull(...)  a2i(unsigned long long, __VA_ARGS__)
-
-
-#endif  // include guard

diff --git a/lib/atoi/getnum.h b/lib/atoi/getnum.h
index 6ceffa047259c3ac5c8a1e3d01f81c4b1cfdce87..e5cb50f4601e6b646bce38d92cb688d1bdbd2c24 100644 (file)
--- a/lib/atoi/getnum.h
+++ b/lib/atoi/getnum.h
@@ -13,8 +13,7 @@
 #include <stddef.h>
 #include <sys/types.h>
 
-#include "atoi/a2i/a2i.h"
-#include "atoi/a2i/a2s.h"
+#include "atoi/a2i.h"
 #include "attr.h"
 #include "typetraits.h"
 

diff --git a/lib/atoi/str2i.h b/lib/atoi/str2i.h
index 5e54ced4f1e5512f48e1a1c2bcd55d6b397eed9b..2061d8f872082cf9058d63ae3432fa9162b4185f 100644 (file)
--- a/lib/atoi/str2i.h
+++ b/lib/atoi/str2i.h
@@ -11,7 +11,7 @@
 
 #include <stddef.h>
 
-#include "atoi/a2i/a2i.h"
+#include "atoi/a2i.h"
 #include "typetraits.h"
 
 

diff --git a/lib/getdef.c b/lib/getdef.c
index 940b1c7b06194133a4a85fbf8255f5b162fe1326..9bcba20dc2258290bd5b7a7e397b342be5c39b57 100644 (file)
--- a/lib/getdef.c
+++ b/lib/getdef.c
@@ -22,8 +22,7 @@
 #include <libeconf.h>
 #endif
 
-#include "atoi/a2i/a2s.h"
-#include "atoi/a2i/a2u.h"
+#include "atoi/a2i.h"
 #include "atoi/str2i.h"
 #include "defines.h"
 #include "getdef.h"

diff --git a/lib/getrange.c b/lib/getrange.c
index 89c5f394de26c81d4f643d30843f85df6e986103..a7f8f0596379d75e5180ac4172a0fee46bad9bf6 100644 (file)
--- a/lib/getrange.c
+++ b/lib/getrange.c
@@ -10,7 +10,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include "atoi/a2i/a2u.h"
+#include "atoi/a2i.h"
 #include "defines.h"
 #include "prototypes.h"
 #include "string/strcmp/streq.h"

diff --git a/lib/gettime.c b/lib/gettime.c
index 0de0e7f78cb2d98a809ca7fa21e936b8f0e945d7..97b873ef2bf9817d02399e79c477f662b565269b 100644 (file)
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -11,7 +11,7 @@
 #include <limits.h>
 #include <stdio.h>
 
-#include "atoi/a2i/a2i.h"
+#include "atoi/a2i.h"
 #include "defines.h"
 #include "prototypes.h"
 #include "shadowlog.h"

diff --git a/lib/idmapping.c b/lib/idmapping.c
index bd9dbd8a7a4a5e4ec4f10eff150d6aaeae492a1f..9c5723f66c26cae4259e40d075445c6441a93c48 100644 (file)
--- a/lib/idmapping.c
+++ b/lib/idmapping.c
@@ -21,7 +21,7 @@
 
 #include "alloc/calloc.h"
 #include "alloc/malloc.h"
-#include "atoi/a2i/a2u.h"
+#include "atoi/a2i.h"
 #include "idmapping.h"
 #include "prototypes.h"
 #include "shadowlog.h"

diff --git a/lib/limits.c b/lib/limits.c
index 779c5db0c3f155929187b762770cfb4507ef29b5..136e5e31c39b74386deaff11d8ecd35e2b28e529 100644 (file)
--- a/lib/limits.c
+++ b/lib/limits.c
@@ -30,8 +30,7 @@
 #include "shadowlog.h"
 #include <sys/resource.h>
 
-#include "atoi/a2i/a2i.h"
-#include "atoi/a2i/a2s.h"
+#include "atoi/a2i.h"
 #include "atoi/str2i.h"
 #include "string/memset/memzero.h"
 #include "string/strcmp/streq.h"

diff --git a/lib/shadow/shadow/sgetspent.c b/lib/shadow/shadow/sgetspent.c
index 5026ef99db5d66eeff44d39553211c7ab18f1c0c..7ad2ede0ba0f6df57641e7da6968a43bc79ab4c4 100644 (file)
--- a/lib/shadow/shadow/sgetspent.c
+++ b/lib/shadow/shadow/sgetspent.c
@@ -18,7 +18,7 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include "atoi/a2i/a2s.h"
+#include "atoi/a2i.h"
 #include "atoi/str2i.h"
 #include "defines.h"
 #include "prototypes.h"

diff --git a/src/chage.c b/src/chage.c
index 2563a498d4592f0f8875b32237343492d11be3cf..8555db8aec4c5bc3fb765399591ce1456ab0ee04 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -21,7 +21,7 @@
 #include <time.h>
 #include <pwd.h>
 
-#include "atoi/a2i/a2s.h"
+#include "atoi/a2i.h"
 #include "defines.h"
 #include "fields.h"
 #include "prototypes.h"

diff --git a/src/passwd.c b/src/passwd.c
index 9e26296618725967a3d0b57f3ec3fd05b32ca759..c44f404a31871e828406cf31435493d2483ac215 100644 (file)
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -21,7 +21,7 @@
 #include <time.h>
 
 #include "agetpass.h"
-#include "atoi/a2i/a2s.h"
+#include "atoi/a2i.h"
 #include "chkname.h"
 #include "defines.h"
 #include "getdef.h"

diff --git a/src/useradd.c b/src/useradd.c
index ac9498d9572b9b722cbc957d2352ef2c4a67cb51..d4883b5efb0ee5cea6b43f4e18fc81ef1c3776e4 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 
 #include "alloc/malloc.h"
-#include "atoi/a2i/a2s.h"
+#include "atoi/a2i.h"
 #include "atoi/getnum.h"
 #include "chkname.h"
 #include "defines.h"

diff --git a/src/usermod.c b/src/usermod.c
index 4cd931a02fd545bee5fc834af78ed34d52cd810e..b3e4c0561cdef7b7be6d979ede513f6344664e86 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -34,8 +34,7 @@
 #include <time.h>
 
 #include "alloc/malloc.h"
-#include "atoi/a2i/a2i.h"
-#include "atoi/a2i/a2s.h"
+#include "atoi/a2i.h"
 #include "atoi/getnum.h"
 #include "chkname.h"
 #include "defines.h"