From df445b0891eda678c9cdf511277a5d5c524f1404 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 25 Oct 1997 22:03:55 +0000 Subject: Remove old-style xmalloc and xrealloc decls. --- src/chgrp.c | 2 -- src/chmod.c | 2 -- src/chown.c | 2 -- src/copy.c | 1 - src/cp-hash.c | 5 +---- src/cp.c | 1 - src/dd.c | 1 - src/df.c | 1 - src/du.c | 3 --- src/install.c | 1 - src/ls.c | 5 ++--- src/rm.c | 1 - 12 files changed, 3 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/chgrp.c b/src/chgrp.c index 801f5ad18..e948fc76e 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -67,8 +67,6 @@ enum Change_status }; char *group_member (); -char *xmalloc (); -char *xrealloc (); static int change_dir_group __P ((const char *dir, int group, const struct stat *statp)); diff --git a/src/chmod.c b/src/chmod.c index 14a16abda..29587e5c3 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -36,8 +36,6 @@ enum Change_status void mode_string (); void strip_trailing_slashes (); -char *xmalloc (); -char *xrealloc (); static int change_dir_mode __P ((const char *dir, const struct mode_change *changes, diff --git a/src/chown.c b/src/chown.c index 7c9bb458d..66692e43e 100644 --- a/src/chown.c +++ b/src/chown.c @@ -57,8 +57,6 @@ struct group *getgrgid (); char *parse_user_spec (); void strip_trailing_slashes (); -char *xmalloc (); -char *xrealloc (); enum Change_status { diff --git a/src/copy.c b/src/copy.c index 54d6a6102..c65fadb38 100644 --- a/src/copy.c +++ b/src/copy.c @@ -36,7 +36,6 @@ struct dir_list int full_write (); int euidaccess (); -char *xmalloc (); int yesno (); static int copy_internal __P ((const char *src_path, const char *dst_path, diff --git a/src/cp-hash.c b/src/cp-hash.c index 14fe478e3..e9535d453 100644 --- a/src/cp-hash.c +++ b/src/cp-hash.c @@ -1,5 +1,5 @@ /* cp-hash.c -- file copying (hash search routines) - Copyright (C) 89, 90, 91, 95, 1996 Free Software Foundation. + Copyright (C) 89, 90, 91, 95, 1996, 1997 Free Software Foundation. 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 @@ -41,9 +41,6 @@ struct htab struct entry *hash[1]; /* Vector of pointers in `entry_tab'. */ }; -char *xmalloc (); -char *xrealloc (); - struct htab *htab; char new_file; diff --git a/src/cp.c b/src/cp.c index e4eef6f22..d09a2f7cd 100644 --- a/src/cp.c +++ b/src/cp.c @@ -58,7 +58,6 @@ char *base_name (); char *dirname (); enum backup_type get_version (); void strip_trailing_slashes (); -char *xmalloc (); char *xstrdup (); /* Initial number of entries in each hash table entry's table of inodes. */ diff --git a/src/dd.c b/src/dd.c index dd00370ff..45be14f92 100644 --- a/src/dd.c +++ b/src/dd.c @@ -93,7 +93,6 @@ /* Use separate input and output buffers, and combine partial input blocks. */ #define C_TWOBUFS 04000 -char *xmalloc (); int safe_read (); int full_write (); diff --git a/src/df.c b/src/df.c index 71a10d0ca..2194998d5 100644 --- a/src/df.c +++ b/src/df.c @@ -32,7 +32,6 @@ char *dirname (); void strip_trailing_slashes (); -char *xmalloc (); char *xstrdup (); char *xgetcwd (); diff --git a/src/du.c b/src/du.c index 927d147dc..2ccd10edc 100644 --- a/src/du.c +++ b/src/du.c @@ -100,9 +100,6 @@ typedef struct int stat (); int lstat (); -char *xmalloc (); -char *xrealloc (); - static int hash_insert __P ((ino_t ino, dev_t dev)); static int hash_insert2 __P ((struct htab *_htab, ino_t ino, dev_t dev)); static long count_entry __P ((const char *ent, int top, dev_t last_dev, diff --git a/src/install.c b/src/install.c index bf9ffbe6f..7938325b8 100644 --- a/src/install.c +++ b/src/install.c @@ -118,7 +118,6 @@ gid_t getgid (); #endif char *base_name (); -char *xmalloc (); int safe_read (); int full_write (); int isdir (); diff --git a/src/ls.c b/src/ls.c index 179128a5b..12dab5e24 100644 --- a/src/ls.c +++ b/src/ls.c @@ -148,8 +148,6 @@ char *getgroup (); char *getuser (); void strip_trailing_slashes (); char *xstrdup (); -char *xmalloc (); -char *xrealloc (); void invalid_arg (); static char *make_link_path __P ((const char *path, const char *linkname)); @@ -1641,7 +1639,8 @@ gobble_file (const char *name, int explicit_arg, const char *dirname) if (files_index == nfiles) { nfiles *= 2; - files = (struct fileinfo *) xrealloc (files, sizeof (*files) * nfiles); + files = (struct fileinfo *) xrealloc ((char *) files, + sizeof (*files) * nfiles); } files[files_index].linkname = 0; diff --git a/src/rm.c b/src/rm.c index 4734f8417..40231bdfd 100644 --- a/src/rm.c +++ b/src/rm.c @@ -127,7 +127,6 @@ struct File_spec char *base_name (); int euidaccess (); void strip_trailing_slashes (); -char *xmalloc (); int yesno (); /* Forward dcl for recursively called function. */ -- cgit v1.2.3-70-g09d2