WARNS=2 fixup.

This commit is contained in:
markm 2001-12-02 13:18:59 +00:00
parent 6ca5ece2c9
commit b8b83fee29
4 changed files with 12 additions and 8 deletions

View File

@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
PROG= column
CFLAGS+=-Wall
WARNS?= 2
.include <bsd.prog.mk>

View File

@ -69,7 +69,7 @@ int entries; /* number of records */
int eval; /* exit value */
int maxlength; /* longest record */
char **list; /* array of pointers to records */
char *separator = "\t "; /* field separator for table option */
const char *separator = "\t "; /* field separator for table option */
int
main(argc, argv)

View File

@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
PROG= comm
CFLAGS+=-Wall
WARNS?= 2
.include <bsd.prog.mk>

View File

@ -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 {