summaryrefslogtreecommitdiffstats
path: root/usr.bin/comm
diff options
context:
space:
mode:
authorarchie <archie@FreeBSD.org>1998-12-06 22:58:23 +0000
committerarchie <archie@FreeBSD.org>1998-12-06 22:58:23 +0000
commit167c036e91fb24a62d627d16a2f3afa6d875c9e2 (patch)
treee40a696092a51458b052ff258b3700d51fc2ca09 /usr.bin/comm
parent3f56407712318be6faa0b98ad8db4b5a83ef4c93 (diff)
downloadFreeBSD-src-167c036e91fb24a62d627d16a2f3afa6d875c9e2.zip
FreeBSD-src-167c036e91fb24a62d627d16a2f3afa6d875c9e2.tar.gz
Tweaks to allow compiling -Wall (mostly adding "const" to char rcsid[]).
Diffstat (limited to 'usr.bin/comm')
-rw-r--r--usr.bin/comm/Makefile1
-rw-r--r--usr.bin/comm/comm.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile
index 6942023..d311527 100644
--- a/usr.bin/comm/Makefile
+++ b/usr.bin/comm/Makefile
@@ -1,5 +1,6 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= comm
+CFLAGS+=-Wall
.include <bsd.prog.mk>
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index debbb0b..70e7c0d 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -35,7 +35,7 @@
*/
#ifndef lint
-static char copyright[] =
+static const char copyright[] =
"@(#) Copyright (c) 1989, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
@@ -45,7 +45,7 @@ static char copyright[] =
static char sccsid[] = "From: @(#)comm.c 8.4 (Berkeley) 5/4/95";
#endif
static const char rcsid[] =
- "$Id$";
+ "$Id: comm.c,v 1.4 1997/09/07 15:09:17 joerg Exp $";
#endif /* not lint */
#include <err.h>
@@ -69,7 +69,7 @@ main(argc, argv)
int argc;
char *argv[];
{
- int comp, file1done, file2done, read1, read2;
+ int comp, file1done = 0, file2done = 0, read1, read2;
int ch, flag1, flag2, flag3, iflag;
FILE *fp1, *fp2;
char *col1, *col2, *col3;
OpenPOWER on IntegriCloud