From 47e9e6a16810657f2570a863a3bf734506eadd66 Mon Sep 17 00:00:00 2001 From: David Malone Date: Sun, 28 Jul 2002 15:32:17 +0000 Subject: [PATCH] ANSIify function definitions to avoid a warning. --- usr.bin/compress/compress.c | 22 ++++++---------------- usr.bin/compress/zopen.c | 31 ++++++++----------------------- 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c index f7d13732b6ce..ceaac87c6bc4 100644 --- a/usr.bin/compress/compress.c +++ b/usr.bin/compress/compress.c @@ -71,9 +71,7 @@ void usage(int); int eval, force, verbose; int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { enum {COMPRESS, DECOMPRESS} style; size_t len; @@ -198,9 +196,7 @@ main(argc, argv) } void -compress(in, out, bits) - const char *in, *out; - int bits; +compress(const char *in, const char *out, int bits) { size_t nr; struct stat isb, sb; @@ -290,9 +286,7 @@ err: if (ofp) { } void -decompress(in, out, bits) - const char *in, *out; - int bits; +decompress(const char *in, const char *out, int bits) { size_t nr; struct stat sb; @@ -357,9 +351,7 @@ err: if (ofp) { } void -setfile(name, fs) - const char *name; - struct stat *fs; +setfile(const char *name, struct stat *fs) { static struct timeval tv[2]; @@ -389,8 +381,7 @@ setfile(name, fs) } int -permission(fname) - const char *fname; +permission(const char *fname) { int ch, first; @@ -404,8 +395,7 @@ permission(fname) } void -usage(iscompress) - int iscompress; +usage(int iscompress) { if (iscompress) (void)fprintf(stderr, diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c index 20f9bfbda308..b52c8244639f 100644 --- a/usr.bin/compress/zopen.c +++ b/usr.bin/compress/zopen.c @@ -236,10 +236,7 @@ static int zwrite(void *, const char *, int); * questions about this implementation to ames!jaw. */ static int -zwrite(cookie, wbp, num) - void *cookie; - const char *wbp; - int num; +zwrite(void *cookie, const char *wbp, int num) { code_int i; int c, disp; @@ -327,8 +324,7 @@ nomatch: if (output(zs, (code_int) ent) == -1) } static int -zclose(cookie) - void *cookie; +zclose(void *cookie) { struct s_zstate *zs; int rval; @@ -373,9 +369,7 @@ static char_type rmask[9] = {0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff}; static int -output(zs, ocode) - struct s_zstate *zs; - code_int ocode; +output(struct s_zstate *zs, code_int ocode) { int r_off; u_int bits; @@ -463,10 +457,7 @@ output(zs, ocode) * compress() routine. See the definitions above. */ static int -zread(cookie, rbp, num) - void *cookie; - char *rbp; - int num; +zread(void *cookie, char *rbp, int num) { u_int count; struct s_zstate *zs; @@ -574,8 +565,7 @@ eof: return (num - count); * code or -1 is returned. */ static code_int -getcode(zs) - struct s_zstate *zs; +getcode(struct s_zstate *zs) { code_int gcode; int r_off, bits; @@ -633,8 +623,7 @@ getcode(zs) } static int -cl_block(zs) /* Table clear for block compress. */ - struct s_zstate *zs; +cl_block(struct s_zstate *zs) /* Table clear for block compress. */ { long rat; @@ -662,9 +651,7 @@ cl_block(zs) /* Table clear for block compress. */ } static void -cl_hash(zs, cl_hsize) /* Reset code table. */ - struct s_zstate *zs; - count_int cl_hsize; +cl_hash(struct s_zstate *zs, count_int cl_hsize) /* Reset code table. */ { count_int *htab_p; long i, m1; @@ -696,9 +683,7 @@ cl_hash(zs, cl_hsize) /* Reset code table. */ } FILE * -zopen(fname, mode, bits) - const char *fname, *mode; - int bits; +zopen(const char *fname, const char *mode, int bits) { struct s_zstate *zs;