emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge pull request #288 from whzhe51/br_whzhe

Browse Source 
xfree: move xfree() function to xmalloc.c
This commit is contained in:
Serge Hallyn 2020-10-16 09:59:34 -05:00 committed by GitHub
commit f8642a1986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/prototypes.h
View File

@ -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 *);

7
libmisc/xmalloc.c
View File

@ -66,3 +66,10 @@
{
return strcpy (xmalloc (strlen (str) + 1), str);
}
void xfree(void *ap)
{
if (ap) {
free(ap);
}
}

6
src/gpasswd.c
View File

@ -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
*/