From: Alejandro Colomar Date: Thu, 27 Jun 2024 14:42:54 +0000 (+0200) Subject: lib/alloc/, lib/, src/, tests/: Organize the allocation APIs in a new subdirectory X-Git-Tag: 4.17.0-rc1~176 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3049bef9c332738d22af3101e547f404fc98c867;p=thirdparty%2Fshadow.git lib/alloc/, lib/, src/, tests/: Organize the allocation APIs in a new subdirectory Signed-off-by: Alejandro Colomar --- diff --git a/lib/Makefile.am b/lib/Makefile.am index 231ed326e..fb509555d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -29,8 +29,20 @@ libshadow_la_SOURCES = \ age.c \ agetpass.c \ agetpass.h \ - alloc.c \ - alloc.h \ + alloc/calloc.c \ + alloc/calloc.h \ + alloc/malloc.c \ + alloc/malloc.h \ + alloc/realloc.c \ + 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.c \ atoi/a2i.h \ atoi/getnum.c \ diff --git a/lib/addgrps.c b/lib/addgrps.c index dae3dba2e..b2e17a9dd 100644 --- a/lib/addgrps.c +++ b/lib/addgrps.c @@ -18,7 +18,8 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" +#include "alloc/reallocf.h" #include "shadowlog.h" #ident "$Id$" diff --git a/lib/agetpass.c b/lib/agetpass.c index 5d9f9286d..ecf40da95 100644 --- a/lib/agetpass.c +++ b/lib/agetpass.c @@ -16,7 +16,7 @@ #ident "$Id$" -#include "alloc.h" +#include "alloc/malloc.h" #if WITH_LIBBSD == 0 #include "freezero.h" diff --git a/lib/alloc.c b/lib/alloc.c deleted file mode 100644 index 918f9507e..000000000 --- a/lib/alloc.c +++ /dev/null @@ -1,66 +0,0 @@ -// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh -// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz -// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko -// SPDX-FileCopyrightText: 2008 , Nicolas François -// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar -// SPDX-License-Identifier: BSD-3-Clause - -/* Replacements for malloc and strdup with error checking. Too trivial - to be worth copyrighting :-). I did that because a lot of code used - malloc and strdup without checking for NULL pointer, and I like some - message better than a core dump... --marekm - - Yeh, but. Remember that bailing out might leave the system in some - bizarre state. You really want to put in error checking, then add - some back-out failure recovery code. -- jfh */ - -#include - -#include "alloc.h" - -#include -#include -#include - -#include "defines.h" -#include "prototypes.h" -#include "shadowlog.h" - - -extern inline void *xmallocarray(size_t nmemb, size_t size); -extern inline void *mallocarray(size_t nmemb, size_t size); -extern inline void *reallocarrayf(void *p, size_t nmemb, size_t size); - - -void * -xcalloc(size_t nmemb, size_t size) -{ - void *p; - - p = calloc(nmemb, size); - if (p == NULL) - goto x; - - return p; - -x: - fprintf(log_get_logfd(), _("%s: %s\n"), - log_get_progname(), strerror(errno)); - exit(13); -} - - -void * -xreallocarray(void *p, size_t nmemb, size_t size) -{ - p = reallocarrayf(p, nmemb, size); - if (p == NULL) - goto x; - - return p; - -x: - fprintf(log_get_logfd(), _("%s: %s\n"), - log_get_progname(), strerror(errno)); - exit(13); -} diff --git a/lib/alloc.h b/lib/alloc.h deleted file mode 100644 index 37afe5051..000000000 --- a/lib/alloc.h +++ /dev/null @@ -1,82 +0,0 @@ -// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar -// SPDX-License-Identifier: BSD-3-Clause - - -#ifndef SHADOW_INCLUDE_LIB_MALLOC_H_ -#define SHADOW_INCLUDE_LIB_MALLOC_H_ - - -#include - -#include -#include -#include -#include -#include - -#include "attr.h" - - -#define CALLOC(n, type) ((type *) calloc(n, sizeof(type))) -#define XCALLOC(n, type) ((type *) xcalloc(n, sizeof(type))) -#define MALLOC(n, type) ((type *) mallocarray(n, sizeof(type))) -#define XMALLOC(n, type) ((type *) xmallocarray(n, sizeof(type))) - -#define REALLOC(ptr, n, type) \ -( \ - _Generic(ptr, type *: (type *) reallocarray(ptr, n, sizeof(type))) \ -) - -#define REALLOCF(ptr, n, type) \ -( \ - _Generic(ptr, type *: (type *) reallocarrayf(ptr, n, sizeof(type))) \ -) - -#define XREALLOC(ptr, n, type) \ -( \ - _Generic(ptr, type *: (type *) xreallocarray(ptr, n, sizeof(type))) \ -) - - -ATTR_MALLOC(free) -inline void *xmallocarray(size_t nmemb, size_t size); -ATTR_MALLOC(free) -inline void *mallocarray(size_t nmemb, size_t size); -ATTR_MALLOC(free) -inline void *reallocarrayf(void *p, size_t nmemb, size_t size); - -ATTR_MALLOC(free) -void *xcalloc(size_t nmemb, size_t size); -ATTR_MALLOC(free) -void *xreallocarray(void *p, size_t nmemb, size_t size); - - -inline void * -xmallocarray(size_t nmemb, size_t size) -{ - return xreallocarray(NULL, nmemb, size); -} - - -inline void * -mallocarray(size_t nmemb, size_t size) -{ - return reallocarray(NULL, nmemb, size); -} - - -inline void * -reallocarrayf(void *p, size_t nmemb, size_t size) -{ - void *q; - - q = reallocarray(p, nmemb, size); - - /* realloc(p, 0) is equivalent to free(p); avoid double free. */ - if (q == NULL && nmemb != 0 && size != 0) - free(p); - return q; -} - - -#endif // include guard diff --git a/lib/alloc/calloc.c b/lib/alloc/calloc.c new file mode 100644 index 000000000..55baafdc1 --- /dev/null +++ b/lib/alloc/calloc.c @@ -0,0 +1,11 @@ +// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh +// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz +// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko +// SPDX-FileCopyrightText: 2008 , Nicolas François +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#include + +#include "alloc/calloc.h" diff --git a/lib/alloc/calloc.h b/lib/alloc/calloc.h new file mode 100644 index 000000000..5c093434a --- /dev/null +++ b/lib/alloc/calloc.h @@ -0,0 +1,17 @@ +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#ifndef SHADOW_INCLUDE_LIB_ALLOC_CALLOC_H_ +#define SHADOW_INCLUDE_LIB_ALLOC_CALLOC_H_ + + +#include + +#include + + +#define CALLOC(n, type) ((type *) calloc(n, sizeof(type))) + + +#endif // include guard diff --git a/lib/alloc/malloc.c b/lib/alloc/malloc.c new file mode 100644 index 000000000..453f32dea --- /dev/null +++ b/lib/alloc/malloc.c @@ -0,0 +1,16 @@ +// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh +// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz +// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko +// SPDX-FileCopyrightText: 2008 , Nicolas François +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#include + +#include "alloc/malloc.h" + +#include + + +extern inline void *mallocarray(size_t nmemb, size_t size); diff --git a/lib/alloc/malloc.h b/lib/alloc/malloc.h new file mode 100644 index 000000000..5badeebb2 --- /dev/null +++ b/lib/alloc/malloc.h @@ -0,0 +1,30 @@ +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#ifndef SHADOW_INCLUDE_LIB_ALLOC_MALLOC_H_ +#define SHADOW_INCLUDE_LIB_ALLOC_MALLOC_H_ + + +#include + +#include + +#include "attr.h" + + +#define MALLOC(n, type) ((type *) mallocarray(n, sizeof(type))) + + +ATTR_MALLOC(free) +inline void *mallocarray(size_t nmemb, size_t size); + + +inline void * +mallocarray(size_t nmemb, size_t size) +{ + return reallocarray(NULL, nmemb, size); +} + + +#endif // include guard diff --git a/lib/alloc/realloc.c b/lib/alloc/realloc.c new file mode 100644 index 000000000..ecdc39805 --- /dev/null +++ b/lib/alloc/realloc.c @@ -0,0 +1,11 @@ +// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh +// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz +// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko +// SPDX-FileCopyrightText: 2008 , Nicolas François +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#include + +#include "alloc/realloc.h" diff --git a/lib/alloc/realloc.h b/lib/alloc/realloc.h new file mode 100644 index 000000000..5ed907889 --- /dev/null +++ b/lib/alloc/realloc.h @@ -0,0 +1,20 @@ +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#ifndef SHADOW_INCLUDE_LIB_ALLOC_REALLOC_H_ +#define SHADOW_INCLUDE_LIB_ALLOC_REALLOC_H_ + + +#include + +#include + + +#define REALLOC(ptr, n, type) \ +( \ + _Generic(ptr, type *: (type *) reallocarray(ptr, n, sizeof(type))) \ +) + + +#endif // include guard diff --git a/lib/alloc/reallocf.c b/lib/alloc/reallocf.c new file mode 100644 index 000000000..953cf7e10 --- /dev/null +++ b/lib/alloc/reallocf.c @@ -0,0 +1,16 @@ +// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh +// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz +// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko +// SPDX-FileCopyrightText: 2008 , Nicolas François +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#include + +#include "alloc/reallocf.h" + +#include + + +extern inline void *reallocarrayf(void *p, size_t nmemb, size_t size); diff --git a/lib/alloc/reallocf.h b/lib/alloc/reallocf.h new file mode 100644 index 000000000..cb90fb3fa --- /dev/null +++ b/lib/alloc/reallocf.h @@ -0,0 +1,41 @@ +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#ifndef SHADOW_INCLUDE_LIB_ALLOC_REALLOCF_H_ +#define SHADOW_INCLUDE_LIB_ALLOC_REALLOCF_H_ + + +#include + +#include +#include + +#include "attr.h" + + +#define REALLOCF(ptr, n, type) \ +( \ + _Generic(ptr, type *: (type *) reallocarrayf(ptr, n, sizeof(type))) \ +) + + +ATTR_MALLOC(free) +inline void *reallocarrayf(void *p, size_t nmemb, size_t size); + + +inline void * +reallocarrayf(void *p, size_t nmemb, size_t size) +{ + void *q; + + q = reallocarray(p, nmemb, size); + + /* realloc(p, 0) is equivalent to free(p); avoid double free. */ + if (q == NULL && nmemb != 0 && size != 0) + free(p); + return q; +} + + +#endif // include guard diff --git a/lib/alloc/x/xcalloc.c b/lib/alloc/x/xcalloc.c new file mode 100644 index 000000000..672d5ee72 --- /dev/null +++ b/lib/alloc/x/xcalloc.c @@ -0,0 +1,36 @@ +// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh +// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz +// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko +// SPDX-FileCopyrightText: 2008 , Nicolas François +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#include + +#include "alloc/x/xcalloc.h" + +#include +#include +#include + +#include "defines.h" +#include "shadowlog.h" + + +void * +xcalloc(size_t nmemb, size_t size) +{ + void *p; + + p = calloc(nmemb, size); + if (p == NULL) + goto x; + + return p; + +x: + fprintf(log_get_logfd(), _("%s: %s\n"), + log_get_progname(), strerror(errno)); + exit(13); +} diff --git a/lib/alloc/x/xcalloc.h b/lib/alloc/x/xcalloc.h new file mode 100644 index 000000000..b78d104f5 --- /dev/null +++ b/lib/alloc/x/xcalloc.h @@ -0,0 +1,24 @@ +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#ifndef SHADOW_INCLUDE_LIB_ALLOC_X_XCALLOC_H_ +#define SHADOW_INCLUDE_LIB_ALLOC_X_XCALLOC_H_ + + +#include + +#include +#include + +#include "attr.h" + + +#define XCALLOC(n, type) ((type *) xcalloc(n, sizeof(type))) + + +ATTR_MALLOC(free) +void *xcalloc(size_t nmemb, size_t size); + + +#endif // include guard diff --git a/lib/alloc/x/xmalloc.c b/lib/alloc/x/xmalloc.c new file mode 100644 index 000000000..223da9a34 --- /dev/null +++ b/lib/alloc/x/xmalloc.c @@ -0,0 +1,16 @@ +// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh +// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz +// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko +// SPDX-FileCopyrightText: 2008 , Nicolas François +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#include + +#include "alloc/x/xmalloc.h" + +#include + + +extern inline void *xmallocarray(size_t nmemb, size_t size); diff --git a/lib/alloc/x/xmalloc.h b/lib/alloc/x/xmalloc.h new file mode 100644 index 000000000..967e18bce --- /dev/null +++ b/lib/alloc/x/xmalloc.h @@ -0,0 +1,31 @@ +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#ifndef SHADOW_INCLUDE_LIB_ALLOC_X_XMALLOC_H_ +#define SHADOW_INCLUDE_LIB_ALLOC_X_XMALLOC_H_ + + +#include + +#include + +#include "alloc/x/xrealloc.h" +#include "attr.h" + + +#define XMALLOC(n, type) ((type *) xmallocarray(n, sizeof(type))) + + +ATTR_MALLOC(free) +inline void *xmallocarray(size_t nmemb, size_t size); + + +inline void * +xmallocarray(size_t nmemb, size_t size) +{ + return xreallocarray(NULL, nmemb, size); +} + + +#endif // include guard diff --git a/lib/alloc/x/xrealloc.c b/lib/alloc/x/xrealloc.c new file mode 100644 index 000000000..76887f961 --- /dev/null +++ b/lib/alloc/x/xrealloc.c @@ -0,0 +1,35 @@ +// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh +// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz +// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko +// SPDX-FileCopyrightText: 2008 , Nicolas François +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#include + +#include "alloc/x/xrealloc.h" + +#include +#include +#include + +#include "alloc/reallocf.h" +#include "defines.h" +#include "shadowlog.h" + + +void * +xreallocarray(void *p, size_t nmemb, size_t size) +{ + p = reallocarrayf(p, nmemb, size); + if (p == NULL) + goto x; + + return p; + +x: + fprintf(log_get_logfd(), _("%s: %s\n"), + log_get_progname(), strerror(errno)); + exit(13); +} diff --git a/lib/alloc/x/xrealloc.h b/lib/alloc/x/xrealloc.h new file mode 100644 index 000000000..fa2d6f1fe --- /dev/null +++ b/lib/alloc/x/xrealloc.h @@ -0,0 +1,30 @@ +// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause + + +#ifndef SHADOW_INCLUDE_LIB_MALLOC_H_ +#define SHADOW_INCLUDE_LIB_MALLOC_H_ + + +#include + +#include +#include +#include +#include +#include + +#include "attr.h" + + +#define XREALLOC(ptr, n, type) \ +( \ + _Generic(ptr, type *: (type *) xreallocarray(ptr, n, sizeof(type))) \ +) + + +ATTR_MALLOC(free) +void *xreallocarray(void *p, size_t nmemb, size_t size); + + +#endif // include guard diff --git a/lib/commonio.c b/lib/commonio.c index 11e4f3c0f..7bc706707 100644 --- a/lib/commonio.c +++ b/lib/commonio.c @@ -22,7 +22,8 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" +#include "alloc/reallocf.h" #include "atoi/getnum.h" #include "commonio.h" #include "defines.h" diff --git a/lib/copydir.c b/lib/copydir.c index 58d7cb8cd..ae48d10eb 100644 --- a/lib/copydir.c +++ b/lib/copydir.c @@ -18,7 +18,8 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" +#include "alloc/x/xmalloc.h" #include "attr.h" #include "prototypes.h" #include "defines.h" diff --git a/lib/env.c b/lib/env.c index 2debf35c2..9cb313712 100644 --- a/lib/env.c +++ b/lib/env.c @@ -16,7 +16,8 @@ #include #include -#include "alloc.h" +#include "alloc/x/xmalloc.h" +#include "alloc/x/xrealloc.h" #include "prototypes.h" #include "defines.h" #include "shadowlog.h" diff --git a/lib/find_new_gid.c b/lib/find_new_gid.c index cfd560982..5c2b855da 100644 --- a/lib/find_new_gid.c +++ b/lib/find_new_gid.c @@ -12,7 +12,7 @@ #include #include -#include "alloc.h" +#include "alloc/calloc.h" #include "prototypes.h" #include "groupio.h" #include "getdef.h" diff --git a/lib/find_new_uid.c b/lib/find_new_uid.c index 45ce712c9..01f63bbfe 100644 --- a/lib/find_new_uid.c +++ b/lib/find_new_uid.c @@ -12,7 +12,7 @@ #include #include -#include "alloc.h" +#include "alloc/calloc.h" #include "prototypes.h" #include "pwio.h" #include "getdef.h" diff --git a/lib/getdef.c b/lib/getdef.c index 347a7f524..c6f669df6 100644 --- a/lib/getdef.c +++ b/lib/getdef.c @@ -22,7 +22,6 @@ #include #endif -#include "alloc.h" #include "atoi/str2i.h" #include "defines.h" #include "getdef.h" diff --git a/lib/groupio.c b/lib/groupio.c index 7b9d45f2c..3984b4af5 100644 --- a/lib/groupio.c +++ b/lib/groupio.c @@ -15,7 +15,8 @@ #include #include -#include "alloc.h" +#include "alloc/calloc.h" +#include "alloc/malloc.h" #include "prototypes.h" #include "defines.h" #include "commonio.h" diff --git a/lib/groupmem.c b/lib/groupmem.c index 69d4435be..b849ba562 100644 --- a/lib/groupmem.c +++ b/lib/groupmem.c @@ -12,7 +12,8 @@ #ident "$Id$" -#include "alloc.h" +#include "alloc/calloc.h" +#include "alloc/malloc.h" #include "memzero.h" #include "prototypes.h" #include "defines.h" diff --git a/lib/gshadow.c b/lib/gshadow.c index b551c4cf1..c26d8a3c5 100644 --- a/lib/gshadow.c +++ b/lib/gshadow.c @@ -17,7 +17,8 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" +#include "alloc/realloc.h" #include "prototypes.h" #include "defines.h" diff --git a/lib/idmapping.c b/lib/idmapping.c index b74fc2da9..fe3ccdfe3 100644 --- a/lib/idmapping.c +++ b/lib/idmapping.c @@ -13,7 +13,8 @@ #include #include -#include "alloc.h" +#include "alloc/calloc.h" +#include "alloc/x/xmalloc.h" #include "atoi/str2i.h" #include "prototypes.h" #include "string/sprintf/stpeprintf.h" diff --git a/lib/list.c b/lib/list.c index 8604cb63e..1132c5c7e 100644 --- a/lib/list.c +++ b/lib/list.c @@ -12,7 +12,7 @@ #include -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "prototypes.h" #include "defines.h" #include "string/strdup/xstrdup.h" diff --git a/lib/loginprompt.c b/lib/loginprompt.c index 9b2aa25c2..7c7531803 100644 --- a/lib/loginprompt.c +++ b/lib/loginprompt.c @@ -15,7 +15,6 @@ #include #include -#include "alloc.h" #include "attr.h" #include "memzero.h" #include "prototypes.h" diff --git a/lib/mail.c b/lib/mail.c index 9bbab2699..b62287e6a 100644 --- a/lib/mail.c +++ b/lib/mail.c @@ -15,7 +15,6 @@ #include #include -#include "alloc.h" #include "getdef.h" #include "string/sprintf/xasprintf.h" diff --git a/lib/nss.c b/lib/nss.c index 80f5e544f..7be9d63c1 100644 --- a/lib/nss.c +++ b/lib/nss.c @@ -9,7 +9,7 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" #include "prototypes.h" #include "../libsubid/subid.h" #include "shadowlog_internal.h" diff --git a/lib/pam_pass_non_interactive.c b/lib/pam_pass_non_interactive.c index 3d10908bd..072752630 100644 --- a/lib/pam_pass_non_interactive.c +++ b/lib/pam_pass_non_interactive.c @@ -17,7 +17,7 @@ #include -#include "alloc.h" +#include "alloc/calloc.h" #include "attr.h" #include "memzero.h" #include "prototypes.h" diff --git a/lib/prefix_flag.c b/lib/prefix_flag.c index 3213febdd..57d24332b 100644 --- a/lib/prefix_flag.c +++ b/lib/prefix_flag.c @@ -14,7 +14,6 @@ #include "atoi/getnum.h" #include "defines.h" -#include "alloc.h" #include "prototypes.h" /*@-exitarg@*/ #include "exitcodes.h" diff --git a/lib/pwmem.c b/lib/pwmem.c index 9c6e58d7e..16e07a2c9 100644 --- a/lib/pwmem.c +++ b/lib/pwmem.c @@ -14,7 +14,7 @@ #include -#include "alloc.h" +#include "alloc/calloc.h" #include "defines.h" #include "memzero.h" #include "prototypes.h" diff --git a/lib/run_part.c b/lib/run_part.c index 670d8150d..2514e15f3 100644 --- a/lib/run_part.c +++ b/lib/run_part.c @@ -11,7 +11,6 @@ #include #include -#include "alloc.h" #include "run_part.h" #include "shadowlog_internal.h" diff --git a/lib/sgetgrent.c b/lib/sgetgrent.c index b6db47116..f62f6973c 100644 --- a/lib/sgetgrent.c +++ b/lib/sgetgrent.c @@ -16,7 +16,8 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" +#include "alloc/reallocf.h" #include "atoi/getnum.h" #include "defines.h" #include "prototypes.h" diff --git a/lib/sgroupio.c b/lib/sgroupio.c index 0297df4ae..08d30ba41 100644 --- a/lib/sgroupio.c +++ b/lib/sgroupio.c @@ -14,7 +14,8 @@ #ident "$Id$" -#include "alloc.h" +#include "alloc/calloc.h" +#include "alloc/malloc.h" #include "prototypes.h" #include "defines.h" #include "commonio.h" diff --git a/lib/shadowmem.c b/lib/shadowmem.c index 9d8f193b2..284cff658 100644 --- a/lib/shadowmem.c +++ b/lib/shadowmem.c @@ -17,7 +17,7 @@ #include #include -#include "alloc.h" +#include "alloc/calloc.h" #include "memzero.h" #include "shadowio.h" diff --git a/lib/sssd.c b/lib/sssd.c index fadb378de..0a92144bc 100644 --- a/lib/sssd.c +++ b/lib/sssd.c @@ -8,7 +8,7 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" #include "exitcodes.h" #include "defines.h" #include "prototypes.h" diff --git a/lib/string/strdup/xstrdup.h b/lib/string/strdup/xstrdup.h index 13164182c..ba3e2556c 100644 --- a/lib/string/strdup/xstrdup.h +++ b/lib/string/strdup/xstrdup.h @@ -14,7 +14,7 @@ #include -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "attr.h" diff --git a/lib/string/strdup/xstrndup.h b/lib/string/strdup/xstrndup.h index 77fd5206a..88263c300 100644 --- a/lib/string/strdup/xstrndup.h +++ b/lib/string/strdup/xstrndup.h @@ -10,7 +10,7 @@ #include -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "sizeof.h" #include "string/strcpy/strncat.h" diff --git a/lib/subordinateio.c b/lib/subordinateio.c index 9dd7702ab..c417e7197 100644 --- a/lib/subordinateio.c +++ b/lib/subordinateio.c @@ -18,7 +18,9 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" +#include "alloc/realloc.h" +#include "alloc/reallocf.h" #include "atoi/str2i.h" #include "string/sprintf/snprintf.h" diff --git a/lib/utmp.c b/lib/utmp.c index ba80f7fd7..e8f9c7937 100644 --- a/lib/utmp.c +++ b/lib/utmp.c @@ -22,7 +22,8 @@ #include #include -#include "alloc.h" +#include "alloc/x/xcalloc.h" +#include "alloc/x/xmalloc.h" #include "sizeof.h" #include "string/strcpy/strncpy.h" #include "string/strcpy/strtcpy.h" diff --git a/lib/xgetXXbyYY.c b/lib/xgetXXbyYY.c index 7d5e914e1..01976fe72 100644 --- a/lib/xgetXXbyYY.c +++ b/lib/xgetXXbyYY.c @@ -31,7 +31,8 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" +#include "alloc/x/xrealloc.h" #include "prototypes.h" #include "shadowlog.h" diff --git a/src/gpasswd.c b/src/gpasswd.c index 70d7547fe..83e56a0e7 100644 --- a/src/gpasswd.c +++ b/src/gpasswd.c @@ -21,7 +21,7 @@ #include #include "agetpass.h" -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "attr.h" #include "defines.h" #include "groupio.h" diff --git a/src/groupmems.c b/src/groupmems.c index 444882cca..7edbd2fe8 100644 --- a/src/groupmems.c +++ b/src/groupmems.c @@ -19,7 +19,7 @@ #endif /* USE_PAM */ #include -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "defines.h" #include "prototypes.h" #include "groupio.h" diff --git a/src/groupmod.c b/src/groupmod.c index 3f6d54eb6..15a673c5d 100644 --- a/src/groupmod.c +++ b/src/groupmod.c @@ -26,7 +26,7 @@ #endif /* USE_PAM */ #endif /* ACCT_TOOLS_SETUID */ -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "atoi/getnum.h" #include "chkname.h" #include "defines.h" diff --git a/src/groups.c b/src/groups.c index d19a80a35..5c9ce4638 100644 --- a/src/groups.c +++ b/src/groups.c @@ -15,7 +15,7 @@ #include #include -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "defines.h" #include "prototypes.h" #include "shadowlog.h" diff --git a/src/id.c b/src/id.c index 673693e0b..247af6d99 100644 --- a/src/id.c +++ b/src/id.c @@ -24,7 +24,7 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" #include "defines.h" /* local function prototypes */ diff --git a/src/login.c b/src/login.c index 338c1a433..cf1753e42 100644 --- a/src/login.c +++ b/src/login.c @@ -25,7 +25,7 @@ #include #include -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "attr.h" #include "chkname.h" #include "defines.h" diff --git a/src/newgrp.c b/src/newgrp.c index 6542abf24..88d97758f 100644 --- a/src/newgrp.c +++ b/src/newgrp.c @@ -18,7 +18,7 @@ #include #include "agetpass.h" -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "defines.h" #include "getdef.h" #include "prototypes.h" diff --git a/src/newusers.c b/src/newusers.c index e5d20491e..4f7b96fa8 100644 --- a/src/newusers.c +++ b/src/newusers.c @@ -30,7 +30,7 @@ #include #include -#include "alloc.h" +#include "alloc/reallocf.h" #include "atoi/getnum.h" #include "atoi/str2i.h" #ifdef ACCT_TOOLS_SETUID diff --git a/src/su.c b/src/su.c index 4e0d4100e..40e8189f9 100644 --- a/src/su.c +++ b/src/su.c @@ -46,7 +46,7 @@ #include #endif /* !USE_PAM */ -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "attr.h" #include "cast.h" #include "prototypes.h" diff --git a/src/useradd.c b/src/useradd.c index 4db0aa3a5..9b4852265 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -36,7 +36,7 @@ #include #include -#include "alloc.h" +#include "alloc/x/xmalloc.h" #include "atoi/str2i.h" #include "atoi/getnum.h" #include "chkname.h" diff --git a/src/usermod.c b/src/usermod.c index b688ee8ed..f80c056fd 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -32,7 +32,8 @@ #include #include -#include "alloc.h" +#include "alloc/malloc.h" +#include "alloc/x/xmalloc.h" #include "atoi/a2i.h" #include "atoi/getnum.h" #include "atoi/str2i.h" diff --git a/src/vipw.c b/src/vipw.c index 5d8d1c2e8..31c3b7795 100644 --- a/src/vipw.c +++ b/src/vipw.c @@ -27,7 +27,6 @@ #include #include -#include "alloc.h" #include "defines.h" #include "getdef.h" #include "groupio.h" diff --git a/tests/libsubid/04_nss/libsubid_zzz.c b/tests/libsubid/04_nss/libsubid_zzz.c index 5ba3df95a..d8141ba3b 100644 --- a/tests/libsubid/04_nss/libsubid_zzz.c +++ b/tests/libsubid/04_nss/libsubid_zzz.c @@ -4,7 +4,7 @@ #include #include #include -#include "alloc.h" +#include "alloc/malloc.h" enum subid_status shadow_subid_has_any_range(const char *owner, enum subid_type t, bool *result) { diff --git a/tests/unit/test_chkname.c b/tests/unit/test_chkname.c index e0f9f84b4..127114dcb 100644 --- a/tests/unit/test_chkname.c +++ b/tests/unit/test_chkname.c @@ -16,7 +16,7 @@ #include // Required by #include -#include "alloc.h" +#include "alloc/malloc.h" #include "chkname.h"