From 5e9efe0091c74db77a652064a94e7679b98c40de Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 18 Jun 2003 06:03:29 +0000 Subject: [PATCH] Merge changes from coreutils. Include and unconditionally. Remove explicit declarations of xmalloc and realloc. Include xalloc.h. (read_utmp): Remove anachronistic cast of xmalloc. --- lib/readutmp.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/readutmp.c b/lib/readutmp.c index 2fa8c9295f..1a6af083c9 100644 --- a/lib/readutmp.c +++ b/lib/readutmp.c @@ -1,5 +1,5 @@ /* GNU's read utmp module. - Copyright (C) 1992-2001 Free Software Foundation, Inc. + Copyright (C) 1992-2001, 2003 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 @@ -23,17 +23,12 @@ #include #include -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -# include -#else -# include -#endif /* STDC_HEADERS || HAVE_STRING_H */ +#include +#include #include "readutmp.h" #include "unlocked-io.h" - -char *xmalloc (); -char *realloc (); +#include "xalloc.h" /* Copy UT->ut_name into storage obtained from malloc. Then remove any trailing spaces from the copy, NUL terminate it, and return the copy. */ @@ -112,7 +107,7 @@ read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf) fstat (fileno (utmp), &file_stats); size = file_stats.st_size; if (size > 0) - buf = (STRUCT_UTMP *) xmalloc (size); + buf = xmalloc (size); else { fclose (utmp); -- 2.30.2