From 59097c0922bb1888f0dcdc9ee5b51e33f18fba6f Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 27 Dec 1994 13:36:22 +0000 Subject: Include "error.h" rather than simply declaring `void error ();'. --- src/chgrp.c | 3 ++- src/chmod.c | 3 ++- src/chown.c | 3 ++- src/dd.c | 7 +++++-- src/df.c | 3 ++- src/du.c | 3 ++- src/install.c | 3 ++- src/ln.c | 3 ++- src/ls.c | 3 ++- src/mkdir.c | 4 ++-- src/mkfifo.c | 4 ++-- src/mknod.c | 4 ++-- src/mv.c | 3 ++- src/rm.c | 3 ++- src/rmdir.c | 3 ++- src/sync.c | 3 +-- src/touch.c | 3 ++- 17 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/chgrp.c b/src/chgrp.c index 47b6ef315..a60f7783a 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -22,9 +22,11 @@ #include #include #include + #include "system.h" #include "version.h" #include "safe-lstat.h" +#include "error.h" #ifndef _POSIX_VERSION struct group *getgrnam (); @@ -38,7 +40,6 @@ char *group_member (); char *savedir (); char *xmalloc (); char *xrealloc (); -void error (); static int change_file_group (); static int change_dir_group (); diff --git a/src/chmod.c b/src/chmod.c index 6285ca9c7..193ec71f7 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -27,13 +27,14 @@ #include #include #include + #include "modechange.h" #include "system.h" #include "version.h" #include "safe-stat.h" #include "safe-lstat.h" +#include "error.h" -void error (); void mode_string (); char *savedir (); void strip_trailing_slashes (); diff --git a/src/chown.c b/src/chown.c index 4b4688d8e..8e82316ca 100644 --- a/src/chown.c +++ b/src/chown.c @@ -34,9 +34,11 @@ #include #include #include + #include "system.h" #include "version.h" #include "safe-lstat.h" +#include "error.h" #ifndef _POSIX_VERSION struct passwd *getpwnam (); @@ -54,7 +56,6 @@ char *parse_user_spec (); void strip_trailing_slashes (); char *xmalloc (); char *xrealloc (); -void error (); int isnumber (); static int change_file_owner (); diff --git a/src/dd.c b/src/dd.c index 2b76ef252..8c011d3e7 100644 --- a/src/dd.c +++ b/src/dd.c @@ -64,6 +64,7 @@ #include "system.h" #include "version.h" +#include "error.h" #define equal(p, q) (strcmp ((p),(q)) == 0) #define max(a, b) ((a) > (b) ? (a) : (b)) @@ -91,8 +92,8 @@ #define C_TWOBUFS 04000 char *xmalloc (); -void error (); int safe_read (); +int full_write (); static RETSIGTYPE interrupt_handler (); static int bit_count (); @@ -443,7 +444,9 @@ skip (fdesc, file, records, blocksize, buf) { while (records-- > 0) { - nread = safe_read (fdesc, buf, blocksize). + int nread; + + nread = safe_read (fdesc, buf, blocksize); if (nread < 0) { error (0, errno, "%s", file); diff --git a/src/df.c b/src/df.c index 301f35441..6b63c670f 100644 --- a/src/df.c +++ b/src/df.c @@ -37,15 +37,16 @@ #include #include #include + #include "mountlist.h" #include "fsusage.h" #include "system.h" #include "version.h" #include "safe-stat.h" +#include "error.h" char *xmalloc (); char *xstrdup (); -void error (); static int selected_fstype (); static int excluded_fstype (); diff --git a/src/du.c b/src/du.c index 53711537a..f8161b9d1 100644 --- a/src/du.c +++ b/src/du.c @@ -44,10 +44,12 @@ #include #include #include + #include "system.h" #include "version.h" #include "safe-stat.h" #include "safe-lstat.h" +#include "error.h" /* Initial number of entries in each hash table entry's table of inodes. */ #define INITIAL_HASH_MODULE 100 @@ -93,7 +95,6 @@ char *savedir (); char *xgetcwd (); char *xmalloc (); char *xrealloc (); -void error (); static int hash_insert (); static int hash_insert2 (); diff --git a/src/install.c b/src/install.c index 10672234f..b79e28d1c 100644 --- a/src/install.c +++ b/src/install.c @@ -58,11 +58,13 @@ #include #include #include + #include "system.h" #include "version.h" #include "safe-stat.h" #include "modechange.h" #include "makepath.h" +#include "error.h" #ifdef _POSIX_VERSION #include @@ -88,7 +90,6 @@ int wait (); char *basename (); char *stpcpy (); char *xmalloc (); -void error (); int safe_read (); int full_write (); int isdir (); diff --git a/src/ln.c b/src/ln.c index c856c77d3..3bab2cfe5 100644 --- a/src/ln.c +++ b/src/ln.c @@ -25,11 +25,13 @@ #include #include #include + #include "system.h" #include "backupfile.h" #include "version.h" #include "safe-lstat.h" #include "safe-stat.h" +#include "error.h" int link (); /* Some systems don't declare this anywhere. */ @@ -61,7 +63,6 @@ char *basename (); enum backup_type get_version (); int isdir (); int yesno (); -void error (); void strip_trailing_slashes (); char *stpcpy (); diff --git a/src/ls.c b/src/ls.c index a30a60350..7f04f5ce6 100644 --- a/src/ls.c +++ b/src/ls.c @@ -51,6 +51,7 @@ PATH_MAX. */ #include #endif + #include "system.h" #include @@ -59,6 +60,7 @@ #include "version.h" #include "safe-stat.h" #include "safe-lstat.h" +#include "error.h" #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free @@ -95,7 +97,6 @@ char *getuser (); char *xmalloc (); char *xrealloc (); int argmatch (); -void error (); void invalid_arg (); static char *make_link_path (); diff --git a/src/mkdir.c b/src/mkdir.c index 74b8d377c..a36d7387c 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -31,12 +31,12 @@ #include #include #include + #include "system.h" #include "modechange.h" #include "makepath.h" #include "version.h" - -void error (); +#include "error.h" static void usage (); diff --git a/src/mkfifo.c b/src/mkfifo.c index 1e6d50070..bd12222b0 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -26,11 +26,11 @@ #include #include #include + #include "system.h" #include "modechange.h" #include "version.h" - -void error (); +#include "error.h" static void usage (); diff --git a/src/mknod.c b/src/mknod.c index 45db7d38d..3acadb732 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -31,11 +31,11 @@ #include #include #include + #include "system.h" #include "modechange.h" #include "version.h" - -void error (); +#include "error.h" static void usage (); diff --git a/src/mv.c b/src/mv.c index 0c2ddde10..fa0c68e65 100644 --- a/src/mv.c +++ b/src/mv.c @@ -45,10 +45,12 @@ #include #include #include + #include "system.h" #include "backupfile.h" #include "version.h" #include "safe-lstat.h" +#include "error.h" #ifndef _POSIX_VERSION uid_t geteuid (); @@ -58,7 +60,6 @@ char *basename (); enum backup_type get_version (); int isdir (); int yesno (); -void error (); int safe_read (); int full_write (); void strip_trailing_slashes (); diff --git a/src/rm.c b/src/rm.c index a90c64ccc..871a60dcf 100644 --- a/src/rm.c +++ b/src/rm.c @@ -21,9 +21,11 @@ #include #include #include + #include "system.h" #include "version.h" #include "safe-lstat.h" +#include "error.h" #ifdef D_INO_IN_DIRENT #define D_INO(dp) ((dp)->d_ino) @@ -38,7 +40,6 @@ char *xmalloc (); char *xrealloc (); int eaccess_stat (); int yesno (); -void error (); void strip_trailing_slashes (); static int clear_directory (); diff --git a/src/rmdir.c b/src/rmdir.c index 59f0797c6..4e0673b04 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -26,10 +26,11 @@ #include #include #include + #include "system.h" #include "version.h" +#include "error.h" -void error (); void strip_trailing_slashes (); static void remove_parents (); diff --git a/src/sync.c b/src/sync.c index d2968a5ac..7e437e184 100644 --- a/src/sync.c +++ b/src/sync.c @@ -24,8 +24,7 @@ #include "system.h" #include "long-options.h" #include "version.h" - -void error (); +#include "error.h" /* The name this program was run with. */ char *program_name; diff --git a/src/touch.c b/src/touch.c index ca23f9fca..dc48445c2 100644 --- a/src/touch.c +++ b/src/touch.c @@ -36,9 +36,11 @@ #include #include #include + #include "system.h" #include "version.h" #include "safe-stat.h" +#include "error.h" #ifndef STDC_HEADERS time_t mktime (); @@ -48,7 +50,6 @@ time_t time (); int argmatch (); time_t get_date (); time_t posixtime (); -void error (); int safe_read (); int full_write (); void invalid_arg (); -- cgit v1.2.3-54-g00ecf