lib/, src/, tests/: Move x*() definitions to non-x* header files

Now that all of these are one-liners, they don't need a separate header
file.  Compact stuff.

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 45d9b1ec2d9d002438f0919f07006bc54d760b4c..b6420e3dcd93c07329764d3eac49298cbfca0c0d 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -37,12 +37,6 @@ libshadow_la_SOURCES = \
        alloc/realloc.h \
        alloc/reallocf.c \
        alloc/reallocf.h \
-       alloc/x/xcalloc.c \
-       alloc/x/xcalloc.h \
-       alloc/x/xmalloc.c \
-       alloc/x/xmalloc.h \
-       alloc/x/xrealloc.c \
-       alloc/x/xrealloc.h \
        atoi/a2i/a2i.c \
        atoi/a2i/a2i.h \
        atoi/a2i/a2s.c \
@@ -223,8 +217,6 @@ libshadow_la_SOURCES = \
        string/sprintf/snprintf.h \
        string/sprintf/stpeprintf.c \
        string/sprintf/stpeprintf.h \
-       string/sprintf/xaprintf.c \
-       string/sprintf/xaprintf.h \
        string/strchr/strchrcnt.c \
        string/strchr/strchrcnt.h \
        string/strchr/strchrscnt.c \
@@ -249,12 +241,12 @@ libshadow_la_SOURCES = \
        string/strcpy/strncpy.h \
        string/strcpy/strtcpy.c \
        string/strcpy/strtcpy.h \
+       string/strdup/strdup.c \
+       string/strdup/strdup.h \
        string/strdup/strndupa.c \
        string/strdup/strndupa.h \
-       string/strdup/xstrdup.c \
-       string/strdup/xstrdup.h \
-       string/strdup/xstrndup.c \
-       string/strdup/xstrndup.h \
+       string/strdup/strndup.c \
+       string/strdup/strndup.h \
        string/strftime.c \
        string/strftime.h \
        string/strspn/stpspn.c \
@@ -275,8 +267,6 @@ libshadow_la_SOURCES = \
        string/strtok/strsep2arr.h \
        string/strtok/strsep2ls.c \
        string/strtok/strsep2ls.h \
-       string/strtok/xastrsep2ls.c \
-       string/strtok/xastrsep2ls.h \
        strtoday.c \
        sub.c \
        subordinateio.h \

diff --git a/lib/alloc/calloc.h b/lib/alloc/calloc.h
index 01517204d6c30fedb44e2ffcf972204c5763942d..c6db93dc26b7eec74893509047aedb0748fb61f5 100644 (file)
--- a/lib/alloc/calloc.h
+++ b/lib/alloc/calloc.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
@@ -10,6 +10,8 @@
 
 #include <stdlib.h>
 
+#include "exit_if_null.h"
+
 
 #define CALLOC(n, type)                                                       \
 (                                                                             \
@@ -17,4 +19,7 @@
 )
 
 
+#define XCALLOC(n, type)  exit_if_null(CALLOC(n, type))
+
+
 #endif  // include guard

diff --git a/lib/alloc/malloc.h b/lib/alloc/malloc.h
index 16f0b8cd6f3c712bd1bcfa56228050b0b7c05867..1c0c2366afe6df370dea71f1f9d506ba01ffc341 100644 (file)
--- a/lib/alloc/malloc.h
+++ b/lib/alloc/malloc.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 
 #include "attr.h"
+#include "exit_if_null.h"
 
 
 #define MALLOC(n, type)                                                       \
@@ -19,6 +20,9 @@
 )
 
 
+#define XMALLOC(n, type)  exit_if_null(MALLOC(n, type))
+
+
 ATTR_ALLOC_SIZE(1, 2)
 ATTR_MALLOC(free)
 inline void *mallocarray(size_t nmemb, size_t size);

diff --git a/lib/alloc/realloc.h b/lib/alloc/realloc.h
index 3e3d547e3f1f051b5544c82a95eaf293b6363098..10b68e0fe10173d53ab16e2cda47ae219587d9a2 100644 (file)
--- a/lib/alloc/realloc.h
+++ b/lib/alloc/realloc.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
@@ -10,6 +10,8 @@
 
 #include <stdlib.h>
 
+#include "exit_if_null.h"
+
 
 #define REALLOC(p, n, type)                                                   \
 (                                                                             \
@@ -17,4 +19,7 @@
 )
 
 
+#define XREALLOC(p, n, type)  exit_if_null(REALLOC(p, n, type))
+
+
 #endif  // include guard

diff --git a/lib/alloc/x/xcalloc.h b/lib/alloc/x/xcalloc.h
deleted file mode 100644 (file)
index 849d072..0000000
--- a/lib/alloc/x/xcalloc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ALLOC_X_XCALLOC_H_
-#define SHADOW_INCLUDE_LIB_ALLOC_X_XCALLOC_H_
-
-
-#include "config.h"
-
-#include "alloc/calloc.h"
-#include "exit_if_null.h"
-
-
-#define XCALLOC(n, type)  exit_if_null(CALLOC(n, type))
-
-
-#endif  // include guard

diff --git a/lib/alloc/x/xmalloc.c b/lib/alloc/x/xmalloc.c
deleted file mode 100644 (file)
index ab03820..0000000
--- a/lib/alloc/x/xmalloc.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 "alloc/x/xmalloc.h"

diff --git a/lib/alloc/x/xmalloc.h b/lib/alloc/x/xmalloc.h
deleted file mode 100644 (file)
index 5a1c13b..0000000
--- a/lib/alloc/x/xmalloc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ALLOC_X_XMALLOC_H_
-#define SHADOW_INCLUDE_LIB_ALLOC_X_XMALLOC_H_
-
-
-#include "config.h"
-
-#include "alloc/malloc.h"
-#include "exit_if_null.h"
-
-
-#define XMALLOC(n, type)  exit_if_null(MALLOC(n, type))
-
-
-#endif  // include guard

diff --git a/lib/alloc/x/xrealloc.c b/lib/alloc/x/xrealloc.c
deleted file mode 100644 (file)
index d04ed24..0000000
--- a/lib/alloc/x/xrealloc.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 "alloc/x/xrealloc.h"

diff --git a/lib/alloc/x/xrealloc.h b/lib/alloc/x/xrealloc.h
deleted file mode 100644 (file)
index c395a73..0000000
--- a/lib/alloc/x/xrealloc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ALLOC_X_XREALLOC_H_
-#define SHADOW_INCLUDE_LIB_ALLOC_X_XREALLOC_H_
-
-
-#include "config.h"
-
-#include "alloc/realloc.h"
-#include "exit_if_null.h"
-
-
-#define XREALLOC(p, n, type)  exit_if_null(REALLOC(p, n, type))
-
-
-#endif  // include guard

diff --git a/lib/copydir.c b/lib/copydir.c
index 736e230464d86971c7dffd9020c4bf63f9565451..018d3be75700077897c9e05c482e3c120f640137 100644 (file)
--- a/lib/copydir.c
+++ b/lib/copydir.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "attr.h"
 #include "fs/readlink/areadlink.h"
 #include "prototypes.h"
@@ -39,7 +39,6 @@
 #endif                         /* WITH_ATTR */
 #include "shadowlog.h"
 #include "string/sprintf/aprintf.h"
-#include "string/sprintf/xaprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
 

diff --git a/lib/env.c b/lib/env.c
index 3cc5b61eec12b1adf4d41cb4ba5ef58fe006a828..91424087d995ce587d441cc8308cdf1404d7522f 100644 (file)
--- a/lib/env.c
+++ b/lib/env.c
@@ -16,15 +16,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "alloc/x/xmalloc.h"
-#include "alloc/x/xrealloc.h"
+#include "alloc/malloc.h"
+#include "alloc/realloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "shadowlog.h"
+#include "string/sprintf/aprintf.h"
 #include "string/sprintf/snprintf.h"
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 
 /*

diff --git a/lib/getdef.c b/lib/getdef.c
index 5aad2b6addc5ad7f4269aca463149d72de236427..940b1c7b06194133a4a85fbf8255f5b162fe1326 100644 (file)
--- a/lib/getdef.c
+++ b/lib/getdef.c
@@ -30,7 +30,7 @@
 #include "prototypes.h"
 #include "shadowlog_internal.h"
 #include "sizeof.h"
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/strcaseeq.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"

diff --git a/lib/idmapping.c b/lib/idmapping.c
index e55de97fbfc586797d918dc72cbb36ead4bbbafc..6f32c45e947a91e19abb00c739c6330effaf80ad 100644 (file)
--- a/lib/idmapping.c
+++ b/lib/idmapping.c
@@ -20,7 +20,7 @@
 #endif
 
 #include "alloc/calloc.h"
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "atoi/a2i/a2u.h"
 #include "idmapping.h"
 #include "prototypes.h"

diff --git a/lib/list.c b/lib/list.c
index be8c2ef7799f1332d728e1e66e0b602c78ac053a..097d22a68dd67fd62f5af375aebcca4e7c5b88cc 100644 (file)
--- a/lib/list.c
+++ b/lib/list.c
@@ -12,12 +12,12 @@
 
 #include <assert.h>
 
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "string/strchr/strchrcnt.h"
 #include "string/strcmp/streq.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 #include "string/strtok/strsep2ls.h"
 
 

diff --git a/lib/mail.c b/lib/mail.c
index 519f385e6c03f71acc3dde3e02cd12c80962866d..aa670a83ef00e6fc2ff74f73c67e8db0c6107636 100644 (file)
--- a/lib/mail.c
+++ b/lib/mail.c
@@ -16,7 +16,7 @@
 #include <string.h>
 
 #include "getdef.h"
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 
 #ident "$Id$"
 

diff --git a/lib/obscure.c b/lib/obscure.c
index 0b5d574d63a3ef9a1fd87315875cb0f97e8c6047..adefa72ef2c2f2023789595a75445775e0168537 100644 (file)
--- a/lib/obscure.c
+++ b/lib/obscure.c
@@ -21,9 +21,9 @@
 #include "getdef.h"
 #include "string/ctype/strtoascii/strtolower.h"
 #include "string/memset/memzero.h"
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 
 #if WITH_LIBBSD == 0

diff --git a/lib/prefix_flag.c b/lib/prefix_flag.c
index dd5972cc72d991b90b078d68d28ff184f1a19563..d452d4c3114873976c1b3c2055c1993abbe33bdc 100644 (file)
--- a/lib/prefix_flag.c
+++ b/lib/prefix_flag.c
@@ -31,7 +31,7 @@
 #include "getdef.h"
 #include "shadow/gshadow/gshadow.h"
 #include "shadowlog.h"
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
 

diff --git a/lib/setupenv.c b/lib/setupenv.c
index f5bf2cfadbb2656c6331f72acb68209faa9b0606..1b9a417b1a92e955f46c8367a8da967aa282c528 100644 (file)
--- a/lib/setupenv.c
+++ b/lib/setupenv.c
@@ -26,10 +26,10 @@
 #include <pwd.h>
 #include "getdef.h"
 #include "shadowlog.h"
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 #include "string/strspn/stpspn.h"
 #include "string/strtok/stpsep.h"
 

diff --git a/lib/shadow/gshadow/sgetsgent.c b/lib/shadow/gshadow/sgetsgent.c
index c15bb58314d6a2cc6067ab27467e2f20d0855f27..38dce1c0ca50a1e1a4804acca64c1afc20c68e55 100644 (file)
--- a/lib/shadow/gshadow/sgetsgent.c
+++ b/lib/shadow/gshadow/sgetsgent.c
@@ -16,9 +16,9 @@
 
 #include "shadow/gshadow/sgrp.h"
 #include "string/strcmp/streq.h"
+#include "string/strtok/astrsep2ls.h"
 #include "string/strtok/stpsep.h"
 #include "string/strtok/strsep2arr.h"
-#include "string/strtok/xastrsep2ls.h"
 
 
 #if defined(SHADOWGRP) && !__has_include(<gshadow.h>)

diff --git a/lib/string/sprintf/aprintf.h b/lib/string/sprintf/aprintf.h
index a90742652cc35b17e707d8e33fb387363558ce7d..eaf64e941f830357e03b09c35d527e7fc8d367dc 100644 (file)
--- a/lib/string/sprintf/aprintf.h
+++ b/lib/string/sprintf/aprintf.h
@@ -14,6 +14,11 @@
 #include <stdlib.h>
 
 #include "attr.h"
+#include "exit_if_null.h"
+
+
+// exit-on-error allocate print formatted
+#define xaprintf(...)  exit_if_null(aprintf(__VA_ARGS__))
 
 
 ATTR_MALLOC(free)

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

diff --git a/lib/string/sprintf/xaprintf.h b/lib/string/sprintf/xaprintf.h
deleted file mode 100644 (file)
index 6b23385..0000000
--- a/lib/string/sprintf/xaprintf.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2025, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_STRING_SPRINTF_XASPRINTF_H_
-#define SHADOW_INCLUDE_LIB_STRING_SPRINTF_XASPRINTF_H_
-
-
-#include "config.h"
-
-#include "string/sprintf/aprintf.h"
-#include "exit_if_null.h"
-
-
-// exit-on-error allocate print formatted
-#define xaprintf(...)  exit_if_null(aprintf(__VA_ARGS__))
-
-
-#endif  // include guard

diff --git a/lib/alloc/x/xcalloc.c b/lib/string/strdup/strdup.c
similarity index 80%
rename from lib/alloc/x/xcalloc.c
rename to lib/string/strdup/strdup.c
index 107f054908b769cbc7fdfab45b72582ab7f22e7c..f7169ae0b195ebf9398cd4ee24b9efde4e0e3a29 100644 (file)
--- a/lib/alloc/x/xcalloc.c
+++ b/lib/string/strdup/strdup.c
@@ -4,4 +4,4 @@
 
 #include "config.h"
 
-#include "alloc/x/xcalloc.h"
+#include "string/strdup/strdup.h"

diff --git a/lib/string/strdup/xstrdup.h b/lib/string/strdup/strdup.h
similarity index 83%
rename from lib/string/strdup/xstrdup.h
rename to lib/string/strdup/strdup.h
index 9ba3f8359f5ba9b72ec959449ebdac5d7f0bda36..8d13fc9edbf46310c50456a68a3ef89effa52e0b 100644 (file)
--- a/lib/string/strdup/xstrdup.h
+++ b/lib/string/strdup/strdup.h
@@ -6,8 +6,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRDUP_H_
-#define SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRDUP_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRDUP_STRDUP_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRDUP_STRDUP_H_
 
 
 #include "config.h"

diff --git a/lib/string/strdup/xstrndup.c b/lib/string/strdup/strndup.c
similarity index 78%
rename from lib/string/strdup/xstrndup.c
rename to lib/string/strdup/strndup.c
index 075c1c82f0a555e7aa25130f540304044374da46..961f665ba8eb48c3800d90f585083e140c729c83 100644 (file)
--- a/lib/string/strdup/xstrndup.c
+++ b/lib/string/strdup/strndup.c
@@ -4,4 +4,4 @@
 
 #include "config.h"
 
-#include "string/strdup/xstrndup.h"
+#include "string/strdup/strndup.h"

diff --git a/lib/string/strdup/xstrndup.h b/lib/string/strdup/strndup.h
similarity index 80%
rename from lib/string/strdup/xstrndup.h
rename to lib/string/strdup/strndup.h
index 082ad3ff947f009d369b2128efb995be5790c37e..5971220a11e36ac22f1c764e171b850b318067d9 100644 (file)
--- a/lib/string/strdup/xstrndup.h
+++ b/lib/string/strdup/strndup.h
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRNDUP_H_
-#define SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRNDUP_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRDUP_STRNDUP_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRDUP_STRNDUP_H_
 
 
 #include "config.h"

diff --git a/lib/string/strdup/xstrdup.c b/lib/string/strdup/xstrdup.c
deleted file mode 100644 (file)
index 3b83e18..0000000
--- a/lib/string/strdup/xstrdup.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 "string/strdup/xstrdup.h"

diff --git a/lib/string/strtok/astrsep2ls.h b/lib/string/strtok/astrsep2ls.h
index ccacecab011c9ac6bda4f8f7aaa841a1d2a69814..1a58e1c590bda556350534d24af3a51efb58607c 100644 (file)
--- a/lib/string/strtok/astrsep2ls.h
+++ b/lib/string/strtok/astrsep2ls.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2024-2025, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
@@ -12,18 +12,22 @@
 
 #include "alloc/malloc.h"
 #include "attr.h"
+#include "exit_if_null.h"
 #include "string/strchr/strchrscnt.h"
 #include "string/strtok/strsep2ls.h"
 
 
+// xastrsep2ls - exit-on-error allocate string separate to list-of-strings
+#define xastrsep2ls(s, delim, np)  exit_if_null(astrsep2ls(s, delim, np))
+
+
 ATTR_ACCESS(read_write, 1) ATTR_ACCESS(write_only, 3)
 ATTR_STRING(1) ATTR_STRING(2)
 inline char **astrsep2ls(char *restrict s, const char *restrict delim,
     size_t *restrict np);
 
 
-// allocate string separate to list-of-strings
-// Like strsep2ls(), but allocate the list array.
+// astrsep2ls - allocate string separate to list-of-strings
 inline char **
 astrsep2ls(char *s, const char *restrict delim, size_t *restrict np)
 {

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

diff --git a/lib/string/strtok/xastrsep2ls.h b/lib/string/strtok/xastrsep2ls.h
deleted file mode 100644 (file)
index d9710db..0000000
--- a/lib/string/strtok/xastrsep2ls.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2024-2025, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_STRING_STRTOK_XASTRSEP2LS_H_
-#define SHADOW_INCLUDE_LIB_STRING_STRTOK_XASTRSEP2LS_H_
-
-
-#include "config.h"
-
-#include "exit_if_null.h"
-#include "string/strtok/astrsep2ls.h"
-
-
-#define xastrsep2ls(s, delim, np)  exit_if_null(astrsep2ls(s, delim, np))
-
-
-#endif  // include guard

diff --git a/lib/utmp.c b/lib/utmp.c
index 9c7466352d0e6244ad33254f6cf103cdd81a70b1..675d3c8ebf7eefacac0585bcf644d9513cfd790a 100644 (file)
--- a/lib/utmp.c
+++ b/lib/utmp.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "alloc/x/xcalloc.h"
-#include "alloc/x/xmalloc.h"
+#include "alloc/calloc.h"
+#include "alloc/malloc.h"
 #include "attr.h"
 #include "sizeof.h"
 #include "string/strchr/strnul.h"
@@ -36,8 +36,8 @@
 #include "string/strcmp/strprefix.h"
 #include "string/strcpy/strncpy.h"
 #include "string/strcpy/strtcpy.h"
-#include "string/strdup/xstrdup.h"
-#include "string/strdup/xstrndup.h"
+#include "string/strdup/strdup.h"
+#include "string/strdup/strndup.h"
 
 #ident "$Id$"
 

diff --git a/lib/xgetXXbyYY.c b/lib/xgetXXbyYY.c
index 01976fe72631288ec1efad05f738d69569407903..1a4ca94bbc7a0d5c25cdbbecc38a42d44d276006 100644 (file)
--- a/lib/xgetXXbyYY.c
+++ b/lib/xgetXXbyYY.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 
 #include "alloc/malloc.h"
-#include "alloc/x/xrealloc.h"
+#include "alloc/realloc.h"
 #include "prototypes.h"
 #include "shadowlog.h"
 

diff --git a/src/chage.c b/src/chage.c
index bf5d5ef8c7dc842bd751ebd65ba9e88b6571891e..693bad86ce6073c2054ac4bff5198817bc3789e4 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -32,7 +32,7 @@
 #include "string/sprintf/snprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcpy/strtcpy.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 #include "string/strftime.h"
 #include "time/day_to_str.h"
 /*@-exitarg@*/

diff --git a/src/chfn.c b/src/chfn.c
index 53190bdb66f65dcb2c07e3bf0827ddadc00764a8..582b51e075ce3ee403dfb895887c1105437e2d87 100644 (file)
--- a/src/chfn.c
+++ b/src/chfn.c
@@ -38,7 +38,7 @@
 #include "string/sprintf/stpeprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcpy/strtcpy.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 struct option_flags {
        bool chroot;

diff --git a/src/chsh.c b/src/chsh.c
index 0f03deed5313a50ab1e02aa322efa7cc210d49c7..e87a466d7acfe7c6ec2b4e7aae8af5d0fa83fe2c 100644 (file)
--- a/src/chsh.c
+++ b/src/chsh.c
@@ -34,7 +34,7 @@
 #include "sssd.h"
 #include "string/strcmp/streq.h"
 #include "string/strcpy/strtcpy.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 
 #ifndef SHELLS_FILE

diff --git a/src/gpasswd.c b/src/gpasswd.c
index 5b32fb7d68f1a91a270b7ac81475a475c6509ae2..4baa9a3aae03fd8e241a19e8a1ba4c194bff3b7e 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 
 #include "agetpass.h"
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "attr.h"
 #include "defines.h"
 /*@-exitarg@*/
@@ -39,7 +39,7 @@
 #include "string/sprintf/snprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcpy/strtcpy.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 struct option_flags {
        bool chroot;

diff --git a/src/groupmems.c b/src/groupmems.c
index 3890e023c89cea07b18ae06d16094712f00fbdc9..d8c2643ce60ad3fd42490c941949277b1bb3eb3f 100644 (file)
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -19,7 +19,7 @@
 #endif                         /* USE_PAM */
 #include <pwd.h>
 
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "defines.h"
 #include "groupio.h"
 #include "prototypes.h"
@@ -29,7 +29,7 @@
 #include "shadow/gshadow/sgrp.h"
 #include "shadowlog.h"
 #include "string/strcmp/streq.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 
 /* Exit Status Values */

diff --git a/src/groupmod.c b/src/groupmod.c
index 7cdc88d9d48601c484882bda8e56fbccfa6d0216..0fb21ccf5e854d0bde73d48c6d965c7797698912 100644 (file)
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -27,7 +27,7 @@
 #endif                         /* USE_PAM */
 #endif                         /* ACCT_TOOLS_SETUID */
 
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "atoi/getnum.h"
 #include "chkname.h"
 #include "defines.h"
@@ -44,7 +44,7 @@
 #include "string/sprintf/stpeprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcpy/stpecpy.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 
 /*

diff --git a/src/login.c b/src/login.c
index f52dbeec715891493c776b7b90f3ea0f0879c0f0..8b531534635223f183b8b94922b4b2bd48276b78 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -26,7 +26,7 @@
 #include <sys/ioctl.h>
 #include <assert.h>
 
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "attr.h"
 #include "chkname.h"
 #include "defines.h"
@@ -45,7 +45,7 @@
 #include "string/strcmp/strneq.h"
 #include "string/strcmp/strprefix.h"
 #include "string/strcpy/strtcpy.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 #include "string/strftime.h"
 
 

diff --git a/src/newgrp.c b/src/newgrp.c
index 51b1dcc060d3afb1d300071b434aae5ab6407f1c..123f1b285057a3f6a8e8b8e7125fd2f3325659f9 100644 (file)
--- a/src/newgrp.c
+++ b/src/newgrp.c
@@ -17,7 +17,8 @@
 #include <sys/types.h>
 
 #include "agetpass.h"
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
+#include "alloc/realloc.h"
 #include "chkname.h"
 #include "defines.h"
 /*@-exitarg@*/
@@ -34,7 +35,7 @@
 #include "string/sprintf/snprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 #include <assert.h>
 

diff --git a/src/newusers.c b/src/newusers.c
index d60c92f74316aabda5005c04e634c448cf9f7880..a7ab4a981e7eca6af280281c7c1442eb0e38269d 100644 (file)
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -57,7 +57,7 @@
 #include "sssd.h"
 #include "string/sprintf/snprintf.h"
 #include "string/strcmp/streq.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 #include "string/strtok/stpsep.h"
 #include "string/strtok/strsep2arr.h"
 

diff --git a/src/passwd.c b/src/passwd.c
index d00a4022ebd0417efad35ddc3dbec8ae3b8e0526..a29f9640b2f8e5b9332fca35f81cdf0f6c12f029 100644 (file)
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -33,11 +33,11 @@
 #include "shadowlog.h"
 #include "sssd.h"
 #include "string/memset/memzero.h"
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
 #include "string/strcpy/strtcpy.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 #include "time/day_to_str.h"
 
 

diff --git a/src/su.c b/src/su.c
index ed4086b64e8a23d0e666962bd4b1cf14cc1e0ece..98ced92a01c9b875eca527099d98ff598baf7454 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -46,7 +46,7 @@
 #include <fcntl.h>
 #endif                         /* !USE_PAM */
 
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "attr.h"
 #include "cast.h"
 #include "defines.h"
@@ -59,12 +59,12 @@
 #include "pwauth.h"
 #include "prototypes.h"
 #include "shadowlog.h"
+#include "string/sprintf/aprintf.h"
 #include "string/sprintf/snprintf.h"
-#include "string/sprintf/xaprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
 #include "string/strcpy/strtcpy.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 
 /*

diff --git a/src/sulogin.c b/src/sulogin.c
index b5a8c06782cf0b64024b837f0e7b01349fe4ef39..74d2ff37674e932cfe7eb6dd000e80bbc1752195 100644 (file)
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -29,7 +29,7 @@
 #include "shadowlog.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 
 /*

diff --git a/src/useradd.c b/src/useradd.c
index 28338cf518b52d9f7e342686ff7e9df8d82b57ba..a4dd3638aabfb40b8d019e39fbdde11caa9d5d7d 100644 (file)
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -37,7 +37,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "alloc/x/xmalloc.h"
+#include "alloc/malloc.h"
 #include "atoi/a2i/a2s.h"
 #include "atoi/getnum.h"
 #include "chkname.h"
@@ -70,11 +70,10 @@
 #include "string/memset/memzero.h"
 #include "string/sprintf/aprintf.h"
 #include "string/sprintf/snprintf.h"
-#include "string/sprintf/xaprintf.h"
 #include "string/strcmp/strcaseeq.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 #include "string/strtok/stpsep.h"
 
 

diff --git a/src/userdel.c b/src/userdel.c
index 3754d1ffdb987704f6e0ea49c69e96f2906f03f7..ae8cb61a369b641b10226b8981afd7c19a6a8af8 100644 (file)
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -53,10 +53,9 @@
 #include "shadow/gshadow/sgrp.h"
 #include "shadowlog.h"
 #include "string/sprintf/aprintf.h"
-#include "string/sprintf/xaprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 
 
 /*

diff --git a/src/usermod.c b/src/usermod.c
index d0d68ca9a4d4b8a20950b54df9e47d656a02d7d2..414ff7b56d0317ce463c04be1b83d6d4615189e8 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -34,7 +34,6 @@
 #include <time.h>
 
 #include "alloc/malloc.h"
-#include "alloc/x/xmalloc.h"
 #include "atoi/a2i/a2i.h"
 #include "atoi/a2i/a2s.h"
 #include "atoi/getnum.h"
@@ -65,10 +64,10 @@
 #include "shadowlog.h"
 #include "sssd.h"
 #include "string/memset/memzero.h"
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strdup/xstrdup.h"
+#include "string/strdup/strdup.h"
 #include "time/day_to_str.h"
 #include "typetraits.h"
 

diff --git a/src/vipw.c b/src/vipw.c
index a888fddfdf6a81943ff814f27338af582fefc3a8..29fa55a87f8af1001e25fa24012b815645adec4c 100644 (file)
--- a/src/vipw.c
+++ b/src/vipw.c
@@ -45,7 +45,6 @@
 #include "sssd.h"
 #include "string/sprintf/aprintf.h"
 #include "string/sprintf/snprintf.h"
-#include "string/sprintf/xaprintf.h"
 #include "string/strcmp/streq.h"
 
 

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 8de0a0e0b0464a8d8a28c576a4077a17d2ba96d3..e10c0ca38c7b242ebb50d0ac670fa82390a03a98 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -133,7 +133,6 @@ test_xaprintf_SOURCES = \
     ../../lib/exit_if_null.c \
     ../../lib/shadowlog.c \
     ../../lib/string/sprintf/aprintf.c \
-    ../../lib/string/sprintf/xaprintf.c \
     ../../lib/string/strcmp/streq.c \
     test_xaprintf.c \
     $(NULL)

diff --git a/tests/unit/test_xaprintf.c b/tests/unit/test_xaprintf.c
index d66fa67f872f78e5f9a7d23d3a0aebf6c3ba8e34..995a29e00e389fcbb22dfb519883f54540014cf2 100644 (file)
--- a/tests/unit/test_xaprintf.c
+++ b/tests/unit/test_xaprintf.c
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#include "string/sprintf/xaprintf.h"
+#include "string/sprintf/aprintf.h"
 
 #include <setjmp.h>
 #include <stdarg.h>