From: w00475903 <wanghongzhe@huawei.com>
Date: Tue, 13 Oct 2020 01:29:37 +0000 (-0400)
Subject: xfree: move xfree() function to xmalloc.c
X-Git-Tag: v4.9~49^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F288%2Fhead;p=thirdparty%2Fshadow.git

xfree: move xfree() function to xmalloc.c

Signed-off-by: whzhe <wanghongzhe@huawei.com>
---

diff --git a/lib/prototypes.h b/lib/prototypes.h
index 53d991fea..ac9ad274a 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -448,6 +448,7 @@ extern bool valid (const char *, const struct passwd *);
 extern /*@maynotreturn@*/ /*@only@*//*@out@*//*@notnull@*/char *xmalloc (size_t size)
   /*@ensures MaxSet(result) == (size - 1); @*/;
 extern /*@maynotreturn@*/ /*@only@*//*@notnull@*/char *xstrdup (const char *);
+extern void xfree(void *ap);
 
 /* xgetpwnam.c */
 extern /*@null@*/ /*@only@*/struct passwd *xgetpwnam (const char *);
diff --git a/libmisc/xmalloc.c b/libmisc/xmalloc.c
index 41a3343c9..0c55d5b4e 100644
--- a/libmisc/xmalloc.c
+++ b/libmisc/xmalloc.c
@@ -66,3 +66,10 @@
 {
 	return strcpy (xmalloc (strlen (str) + 1), str);
 }
+
+void xfree(void *ap)
+{
+	if (ap) {
+		free(ap);
+	}
+}
diff --git a/src/gpasswd.c b/src/gpasswd.c
index a25bf3e5d..9331d30c1 100644
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -123,12 +123,6 @@ static void log_gpasswd_success (const char *suffix);
 static void log_gpasswd_success_system (/*@null@*/unused void *arg);
 static void log_gpasswd_success_group (/*@null@*/unused void *arg);
 
-static void xfree(void* p) {
-	if (p) {
-		free(p);
-	}
-}
-
 /*
  * usage - display usage message
  */