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 53d991fea6aacabfd6148796becc97ef5bee5a2a..ac9ad274a426a379ec52abdfd64e66328003fdfd 100644 (file)
--- 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 41a3343c9fd3c5bdbc4108bbdb4afbdefdc78da7..0c55d5b4ec228cc84f574fa5cdf76e74eae5e9a6 100644 (file)
--- 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 a25bf3e5d50c237a14df94f80316861d0fd5f5be..9331d30c1db20e00c20d41c652a98e788984811f 100644 (file)
--- 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
  */