diff options
author | Eric Andersen | 2000-06-19 17:25:40 +0000 |
---|---|---|
committer | Eric Andersen | 2000-06-19 17:25:40 +0000 |
commit | b610615be9aedfac07d1e01f12575707fa3a227c (patch) | |
tree | b94c0d6a506d1ef77f79df246a26d504c84b7110 /archival | |
parent | dbb3019d0de410960feac649a0b9320ae245cca1 (diff) | |
download | busybox-b610615be9aedfac07d1e01f12575707fa3a227c.zip busybox-b610615be9aedfac07d1e01f12575707fa3a227c.tar.gz |
Updates to a number of apps to remove warnings/compile errors under libc5.
Tested under both libc5 and libc6 and all seems well with these fixes.
-Erik
Diffstat (limited to 'archival')
-rw-r--r-- | archival/gunzip.c | 2 | ||||
-rw-r--r-- | archival/gzip.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c index 78ee1d3..f2bb59d 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c @@ -746,7 +746,7 @@ int gunzip_main(int argc, char **argv) exit(FALSE); } } - exit(exit_code); + return(exit_code); } diff --git a/archival/gzip.c b/archival/gzip.c index a971229..9248cfe 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -282,8 +282,6 @@ extern int save_orig_name; /* set if original name must be saved */ #define WARN(msg) {if (!quiet) fprintf msg ; \ if (exit_code == OK) exit_code = WARNING;} -#define do_exit(c) exit(c) - /* in zip.c: */ extern int zip (int in, int out); @@ -1883,13 +1881,13 @@ int gzip_main(int argc, char **argv) inFileNum = open(ifname, O_RDONLY); if (inFileNum < 0) { perror(ifname); - do_exit(WARNING); + exit(WARNING); } /* Get the time stamp on the input file. */ result = stat(ifname, &statBuf); if (result < 0) { perror(ifname); - do_exit(WARNING); + exit(WARNING); } time_stamp = statBuf.st_ctime; ifile_size = statBuf.st_size; @@ -1923,7 +1921,7 @@ int gzip_main(int argc, char **argv) #endif if (outFileNum < 0) { perror(ofname); - do_exit(WARNING); + exit(WARNING); } SET_BINARY_MODE(outFileNum); /* Set permissions on the file */ @@ -1948,7 +1946,7 @@ int gzip_main(int argc, char **argv) } } - do_exit(exit_code); + return(exit_code); } /* trees.c -- output deflated data using Huffman coding |