From 87a5145719d01edb13db352417e460480356b699 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Mon, 12 Aug 2024 01:53:45 +0200 Subject: [PATCH] lib/: Move memzero.[ch] under lib/string/memset/ Signed-off-by: Alejandro Colomar --- lib/Makefile.am | 4 ++-- lib/commonio.c | 2 +- lib/failure.c | 2 +- lib/groupmem.c | 3 ++- lib/limits.c | 2 +- lib/log.c | 2 +- lib/loginprompt.c | 2 +- lib/obscure.c | 2 +- lib/pam_pass_non_interactive.c | 2 +- lib/pwauth.c | 2 +- lib/pwmem.c | 3 ++- lib/sgroupio.c | 3 ++- lib/shadowmem.c | 3 ++- lib/{ => string/memset}/memzero.c | 8 +++----- lib/{ => string/memset}/memzero.h | 12 +++++------- src/chage.c | 2 +- src/faillog.c | 2 +- src/gpasswd.c | 2 +- src/groupadd.c | 2 +- src/lastlog.c | 2 +- src/login.c | 2 +- src/passwd.c | 2 +- src/useradd.c | 2 +- src/usermod.c | 2 +- 24 files changed, 35 insertions(+), 35 deletions(-) rename lib/{ => string/memset}/memzero.c (52%) rename lib/{ => string/memset}/memzero.h (69%) diff --git a/lib/Makefile.am b/lib/Makefile.am index 4b02764d3..89ccc0e35 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -124,8 +124,6 @@ libshadow_la_SOURCES = \ lockpw.c \ loginprompt.c \ mail.c \ - memzero.c \ - memzero.h \ motd.c \ must_be.h \ myname.c \ @@ -174,6 +172,8 @@ libshadow_la_SOURCES = \ spawn.c \ sssd.c \ sssd.h \ + string/memset/memzero.c \ + string/memset/memzero.h \ string/sprintf/snprintf.c \ string/sprintf/snprintf.h \ string/sprintf/stpeprintf.c \ diff --git a/lib/commonio.c b/lib/commonio.c index f7bad1329..5e4dc92d0 100644 --- a/lib/commonio.c +++ b/lib/commonio.c @@ -27,7 +27,6 @@ #include "atoi/getnum.h" #include "commonio.h" #include "defines.h" -#include "memzero.h" #include "nscd.h" #ifdef WITH_TCB #include @@ -35,6 +34,7 @@ #include "prototypes.h" #include "shadowlog_internal.h" #include "sssd.h" +#include "string/memset/memzero.h" #include "string/sprintf/snprintf.h" #include "string/strtok/stpsep.h" diff --git a/lib/failure.c b/lib/failure.c index 298baf9d3..afff11aa6 100644 --- a/lib/failure.c +++ b/lib/failure.c @@ -18,8 +18,8 @@ #include "defines.h" #include "faillog.h" #include "failure.h" -#include "memzero.h" #include "prototypes.h" +#include "string/memset/memzero.h" #include "string/strftime.h" #include "string/strcpy/strtcpy.h" diff --git a/lib/groupmem.c b/lib/groupmem.c index b849ba562..b28fcbc2c 100644 --- a/lib/groupmem.c +++ b/lib/groupmem.c @@ -14,10 +14,11 @@ #include "alloc/calloc.h" #include "alloc/malloc.h" -#include "memzero.h" #include "prototypes.h" #include "defines.h" #include "groupio.h" +#include "string/memset/memzero.h" + /*@null@*/ /*@only@*/struct group *__gr_dup (const struct group *grent) { diff --git a/lib/limits.c b/lib/limits.c index 9713a305b..21c1635d5 100644 --- a/lib/limits.c +++ b/lib/limits.c @@ -35,7 +35,7 @@ #include "atoi/str2i/str2i.h" #include "atoi/str2i/str2s.h" #include "atoi/str2i/str2u.h" -#include "memzero.h" +#include "string/memset/memzero.h" #include "typetraits.h" diff --git a/lib/log.c b/lib/log.c index e195a0f94..87eab365e 100644 --- a/lib/log.c +++ b/lib/log.c @@ -17,8 +17,8 @@ #include #include "defines.h" #include -#include "memzero.h" #include "prototypes.h" +#include "string/memset/memzero.h" #include "string/strcpy/strncpy.h" #include "string/strcpy/strtcpy.h" diff --git a/lib/loginprompt.c b/lib/loginprompt.c index 3d5f5eb3d..95e9018b2 100644 --- a/lib/loginprompt.c +++ b/lib/loginprompt.c @@ -18,8 +18,8 @@ #include "attr.h" #include "defines.h" #include "getdef.h" -#include "memzero.h" #include "prototypes.h" +#include "string/memset/memzero.h" #include "string/strtok/stpsep.h" diff --git a/lib/obscure.c b/lib/obscure.c index 74a32f0c3..d10857bc5 100644 --- a/lib/obscure.c +++ b/lib/obscure.c @@ -16,10 +16,10 @@ #include #include "attr.h" -#include "memzero.h" #include "prototypes.h" #include "defines.h" #include "getdef.h" +#include "string/memset/memzero.h" #include "string/sprintf/xasprintf.h" #include "string/strdup/xstrdup.h" diff --git a/lib/pam_pass_non_interactive.c b/lib/pam_pass_non_interactive.c index 072752630..2c0207b1e 100644 --- a/lib/pam_pass_non_interactive.c +++ b/lib/pam_pass_non_interactive.c @@ -19,9 +19,9 @@ #include "alloc/calloc.h" #include "attr.h" -#include "memzero.h" #include "prototypes.h" #include "shadowlog.h" +#include "string/memset/memzero.h" /*@null@*/ /*@only@*/static const char *non_interactive_password = NULL; static int ni_conv (int num_msg, diff --git a/lib/pwauth.c b/lib/pwauth.c index bbc2d2419..0434dd08f 100644 --- a/lib/pwauth.c +++ b/lib/pwauth.c @@ -21,10 +21,10 @@ #include "agetpass.h" #include "defines.h" -#include "memzero.h" #include "prototypes.h" #include "pwauth.h" #include "getdef.h" +#include "string/memset/memzero.h" #include "string/sprintf/snprintf.h" #ifdef SKEY diff --git a/lib/pwmem.c b/lib/pwmem.c index 16e07a2c9..b68850e60 100644 --- a/lib/pwmem.c +++ b/lib/pwmem.c @@ -16,9 +16,10 @@ #include "alloc/calloc.h" #include "defines.h" -#include "memzero.h" #include "prototypes.h" #include "pwio.h" +#include "string/memset/memzero.h" + /*@null@*/ /*@only@*/struct passwd *__pw_dup (const struct passwd *pwent) { diff --git a/lib/sgroupio.c b/lib/sgroupio.c index 08d30ba41..90a130111 100644 --- a/lib/sgroupio.c +++ b/lib/sgroupio.c @@ -20,8 +20,9 @@ #include "defines.h" #include "commonio.h" #include "getdef.h" -#include "memzero.h" #include "sgroupio.h" +#include "string/memset/memzero.h" + /*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent) { diff --git a/lib/shadowmem.c b/lib/shadowmem.c index 284cff658..e087ed5d7 100644 --- a/lib/shadowmem.c +++ b/lib/shadowmem.c @@ -18,8 +18,9 @@ #include #include "alloc/calloc.h" -#include "memzero.h" #include "shadowio.h" +#include "string/memset/memzero.h" + /*@null@*/ /*@only@*/struct spwd *__spw_dup (const struct spwd *spent) { diff --git a/lib/memzero.c b/lib/string/memset/memzero.c similarity index 52% rename from lib/memzero.c rename to lib/string/memset/memzero.c index 8979e5f83..74a384b35 100644 --- a/lib/memzero.c +++ b/lib/string/memset/memzero.c @@ -1,7 +1,5 @@ -/* - * SPDX-FileCopyrightText: 2023, Alejandro Colomar - * SPDX-License-Identifier: BSD-3-Clause - */ +// SPDX-FileCopyrightText: 2023, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause #include @@ -10,7 +8,7 @@ #include -#include "memzero.h" +#include "string/memset/memzero.h" extern inline void memzero(void *ptr, size_t size); diff --git a/lib/memzero.h b/lib/string/memset/memzero.h similarity index 69% rename from lib/memzero.h rename to lib/string/memset/memzero.h index 1137e830d..cbf082cac 100644 --- a/lib/memzero.h +++ b/lib/string/memset/memzero.h @@ -1,12 +1,10 @@ -/* - * SPDX-FileCopyrightText: 2022-2023, Christian Göttsche - * SPDX-FileCopyrightText: 2023, Alejandro Colomar - * SPDX-License-Identifier: BSD-3-Clause - */ +// SPDX-FileCopyrightText: 2022-2023, Christian Göttsche +// SPDX-FileCopyrightText: 2023, Alejandro Colomar +// SPDX-License-Identifier: BSD-3-Clause -#ifndef SHADOW_INCLUDE_LIBMISC_MEMZERO_H_ -#define SHADOW_INCLUDE_LIBMISC_MEMZERO_H_ +#ifndef SHADOW_INCLUDE_LIB_STRING_MEMSET_MEMZERO_H_ +#define SHADOW_INCLUDE_LIB_STRING_MEMSET_MEMZERO_H_ #include diff --git a/src/chage.c b/src/chage.c index f2df8dc76..409b54a0f 100644 --- a/src/chage.c +++ b/src/chage.c @@ -28,11 +28,11 @@ #include "atoi/a2i/a2s.h" #include "defines.h" -#include "memzero.h" #include "prototypes.h" #include "pwio.h" #include "shadowio.h" #include "shadowlog.h" +#include "string/memset/memzero.h" #include "string/sprintf/snprintf.h" #include "string/strcpy/strtcpy.h" #include "string/strdup/xstrdup.h" diff --git a/src/faillog.c b/src/faillog.c index cf0292499..709d741ce 100644 --- a/src/faillog.c +++ b/src/faillog.c @@ -22,11 +22,11 @@ #include "atoi/str2i/str2s.h" #include "defines.h" #include "faillog.h" -#include "memzero.h" #include "prototypes.h" /*@-exitarg@*/ #include "exitcodes.h" #include "shadowlog.h" +#include "string/memset/memzero.h" #include "string/strftime.h" diff --git a/src/gpasswd.c b/src/gpasswd.c index 92b83ea0b..b6b3d84f0 100644 --- a/src/gpasswd.c +++ b/src/gpasswd.c @@ -25,7 +25,6 @@ #include "attr.h" #include "defines.h" #include "groupio.h" -#include "memzero.h" #include "nscd.h" #include "sssd.h" #include "prototypes.h" @@ -35,6 +34,7 @@ /*@-exitarg@*/ #include "exitcodes.h" #include "shadowlog.h" +#include "string/memset/memzero.h" #include "string/sprintf/snprintf.h" #include "string/strcpy/strtcpy.h" #include "string/strdup/xstrdup.h" diff --git a/src/groupadd.c b/src/groupadd.c index 1c15f6a45..6db991a84 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -29,7 +29,6 @@ #include "defines.h" #include "getdef.h" #include "groupio.h" -#include "memzero.h" #include "nscd.h" #include "sssd.h" #include "prototypes.h" @@ -38,6 +37,7 @@ #include "sgroupio.h" #endif #include "shadowlog.h" +#include "string/memset/memzero.h" #include "string/strtok/stpsep.h" diff --git a/src/lastlog.c b/src/lastlog.c index 085e70cd0..3bd5c62fa 100644 --- a/src/lastlog.c +++ b/src/lastlog.c @@ -27,10 +27,10 @@ #include "defines.h" #include "prototypes.h" #include "getdef.h" -#include "memzero.h" /*@-exitarg@*/ #include "exitcodes.h" #include "shadowlog.h" +#include "string/memset/memzero.h" #include "string/strftime.h" diff --git a/src/login.c b/src/login.c index cf1753e42..2319f50b3 100644 --- a/src/login.c +++ b/src/login.c @@ -32,12 +32,12 @@ #include "faillog.h" #include "failure.h" #include "getdef.h" -#include "memzero.h" #include "prototypes.h" #include "pwauth.h" /*@-exitarg@*/ #include "exitcodes.h" #include "shadowlog.h" +#include "string/memset/memzero.h" #include "string/sprintf/snprintf.h" #include "string/strcpy/strtcpy.h" #include "string/strdup/xstrdup.h" diff --git a/src/passwd.c b/src/passwd.c index 7ec70fe12..8a46bc0d7 100644 --- a/src/passwd.c +++ b/src/passwd.c @@ -24,7 +24,6 @@ #include "atoi/a2i/a2s.h" #include "defines.h" #include "getdef.h" -#include "memzero.h" #include "nscd.h" #include "sssd.h" #include "prototypes.h" @@ -32,6 +31,7 @@ #include "pwio.h" #include "shadowio.h" #include "shadowlog.h" +#include "string/memset/memzero.h" #include "string/sprintf/xasprintf.h" #include "string/strcpy/strtcpy.h" #include "string/strdup/xstrdup.h" diff --git a/src/useradd.c b/src/useradd.c index 2134ce9e1..dff647af7 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -44,7 +44,6 @@ #include "faillog.h" #include "getdef.h" #include "groupio.h" -#include "memzero.h" #include "nscd.h" #include "sssd.h" #include "prototypes.h" @@ -65,6 +64,7 @@ #include "tcbfuncs.h" #endif #include "shadowlog.h" +#include "string/memset/memzero.h" #include "string/sprintf/snprintf.h" #include "string/sprintf/xasprintf.h" #include "string/strdup/xstrdup.h" diff --git a/src/usermod.c b/src/usermod.c index 7181d47f8..c5d7bbe51 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -42,7 +42,6 @@ #include "faillog.h" #include "getdef.h" #include "groupio.h" -#include "memzero.h" #include "must_be.h" #include "nscd.h" #include "sssd.h" @@ -63,6 +62,7 @@ #include "tcbfuncs.h" #endif #include "shadowlog.h" +#include "string/memset/memzero.h" #include "string/sprintf/xasprintf.h" #include "string/strdup/xstrdup.h" #include "time/day_to_str.h" -- 2.47.3