From: Davidlohr Bueso <dave@xxxxxxx> Signed-off-by: Davidlohr Bueso <dave@xxxxxxx> --- login-utils/chsh.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/login-utils/chsh.c b/login-utils/chsh.c index a893ef9..331acf1 100644 --- a/login-utils/chsh.c +++ b/login-utils/chsh.c @@ -40,6 +40,7 @@ #include "islocal.h" #include "setpwnam.h" #include "nls.h" +#include "xalloc.h" #include "env.h" #include "pathnames.h" @@ -86,7 +87,6 @@ static void usage (FILE *fp); static char *prompt (char *question, char *def_val); static int check_shell (char *shell); static boolean get_shell_list (char *shell); -static void *xmalloc (int bytes); #define memzero(ptr, size) memset((char *) ptr, 0, size) @@ -425,18 +425,3 @@ get_shell_list (char *shell_name) { fclose (fp); return found; } - -/* - * xmalloc () -- malloc that never fails. - */ -static void * -xmalloc (int bytes) { - void *vp; - - vp = malloc (bytes); - if (! vp && bytes > 0) { - perror (_("malloc failed")); - exit (-1); - } - return vp; -} -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html