diff options
| author | markm <markm@FreeBSD.org> | 2001-12-02 13:18:59 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2001-12-02 13:18:59 +0000 |
| commit | b8b83fee29ce8903ec654cfe60137f888b31201a (patch) | |
| tree | e45bfe7eaa5d1e3414e3de7d8bdade9cab756e57 /usr.bin/comm | |
| parent | 6ca5ece2c9e88eace10e40a733c301db69e331cc (diff) | |
| download | FreeBSD-src-b8b83fee29ce8903ec654cfe60137f888b31201a.zip FreeBSD-src-b8b83fee29ce8903ec654cfe60137f888b31201a.tar.gz | |
WARNS=2 fixup.
Diffstat (limited to 'usr.bin/comm')
| -rw-r--r-- | usr.bin/comm/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/comm/comm.c | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile index d311527..0b2a2bd 100644 --- a/usr.bin/comm/Makefile +++ b/usr.bin/comm/Makefile @@ -1,6 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= comm -CFLAGS+=-Wall +WARNS?= 2 .include <bsd.prog.mk> diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c index ad88fcc..4a35984 100644 --- a/usr.bin/comm/comm.c +++ b/usr.bin/comm/comm.c @@ -59,10 +59,10 @@ static const char rcsid[] = #define MAXLINELEN (LINE_MAX + 1) -char *tabs[] = { "", "\t", "\t\t" }; +const char *tabs[] = { "", "\t", "\t\t" }; FILE *file __P((char *)); -void show __P((FILE *, char *, char *)); +void show __P((FILE *, const char *, char *)); int stricoll __P((char *, char *)); static void usage __P((void)); @@ -74,8 +74,9 @@ main(argc, argv) int comp, file1done = 0, file2done = 0, read1, read2; int ch, flag1, flag2, flag3, iflag; FILE *fp1, *fp2; - char *col1, *col2, *col3; - char **p, line1[MAXLINELEN], line2[MAXLINELEN]; + const char *col1, *col2, *col3; + char line1[MAXLINELEN], line2[MAXLINELEN]; + const char **p; flag1 = flag2 = flag3 = 1; iflag = 0; @@ -173,7 +174,8 @@ done: argc -= optind; void show(fp, offset, buf) FILE *fp; - char *offset, *buf; + const char *offset; + char *buf; { do { |
