From c81ef04f8c788c32c9cd97957e1a0cfdd947a0ec Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 25 Jun 2000 21:17:32 +0000 Subject: [PATCH] (xmalloc, xrealloc): Remove functions. Include xalloc.h. Don't include . Don't declare malloc, realloc. --- lib/getusershell.c | 45 ++------------------------------------------- 1 file changed, 2 insertions(+), 43 deletions(-) diff --git a/lib/getusershell.c b/lib/getusershell.c index 730d1b5c04..35f72dbcbd 100644 --- a/lib/getusershell.c +++ b/lib/getusershell.c @@ -1,5 +1,5 @@ /* getusershell.c -- Return names of valid user shells. - Copyright (C) 1991, 1997 Free Software Foundation, Inc. + Copyright (C) 1991, 1997, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,6 +28,7 @@ #include #include +#include "xalloc.h" #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) # define IN_CTYPE_DOMAIN(c) 1 @@ -37,15 +38,6 @@ #define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) -#ifdef STDC_HEADERS -# include -#else -char *malloc (); -char *realloc (); -#endif - -char *xstrdup (); - static int readname (); /* List of shells to use if the shells file is missing. */ @@ -126,39 +118,6 @@ endusershell () } } -/* Allocate N bytes of memory dynamically, with error checking. */ - -static char * -xmalloc (n) - unsigned n; -{ - char *p; - - p = malloc (n); - if (p == 0) - { - fprintf (stderr, "virtual memory exhausted\n"); - exit (1); - } - return p; -} - -/* Reallocate space P to size N, with error checking. */ - -static char * -xrealloc (p, n) - char *p; - unsigned n; -{ - p = realloc (p, n); - if (p == 0) - { - fprintf (stderr, "virtual memory exhausted\n"); - exit (1); - } - return p; -} - /* Read a line from STREAM, removing any newline at the end. Place the result in *NAME, which is malloc'd and/or realloc'd as necessary and can start out NULL, -- 2.30.2