lib/: Move memzero.[ch] under lib/string/memset/
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
committed by
Serge Hallyn
parent
5c0b99c77e
commit
87a5145719
+2
-2
@@ -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 \
|
||||
|
||||
+1
-1
@@ -27,7 +27,6 @@
|
||||
#include "atoi/getnum.h"
|
||||
#include "commonio.h"
|
||||
#include "defines.h"
|
||||
#include "memzero.h"
|
||||
#include "nscd.h"
|
||||
#ifdef WITH_TCB
|
||||
#include <tcb.h>
|
||||
@@ -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"
|
||||
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
|
||||
+2
-1
@@ -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)
|
||||
{
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
#include <time.h>
|
||||
#include "defines.h"
|
||||
#include <lastlog.h>
|
||||
#include "memzero.h"
|
||||
#include "prototypes.h"
|
||||
#include "string/memset/memzero.h"
|
||||
#include "string/strcpy/strncpy.h"
|
||||
#include "string/strcpy/strtcpy.h"
|
||||
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -16,10 +16,10 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#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"
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+2
-1
@@ -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)
|
||||
{
|
||||
|
||||
+2
-1
@@ -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)
|
||||
{
|
||||
|
||||
+2
-1
@@ -18,8 +18,9 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#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)
|
||||
{
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
|
||||
#include <config.h>
|
||||
@@ -10,7 +8,7 @@
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#include "memzero.h"
|
||||
#include "string/memset/memzero.h"
|
||||
|
||||
|
||||
extern inline void memzero(void *ptr, size_t size);
|
||||
@@ -1,12 +1,10 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2022-2023, Christian Göttsche <cgzones@googlemail.com>
|
||||
* SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
// SPDX-FileCopyrightText: 2022-2023, Christian Göttsche <cgzones@googlemail.com>
|
||||
// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
|
||||
// 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 <config.h>
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user