summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.bin/column/Makefile3
-rw-r--r--usr.bin/column/column.c2
-rw-r--r--usr.bin/comm/Makefile3
-rw-r--r--usr.bin/comm/comm.c12
4 files changed, 12 insertions, 8 deletions
diff --git a/usr.bin/column/Makefile b/usr.bin/column/Makefile
index 33de9f6..0f53dab 100644
--- a/usr.bin/column/Makefile
+++ b/usr.bin/column/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= column
-CFLAGS+=-Wall
+WARNS?= 2
.include <bsd.prog.mk>
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index ae732d2..4a01904 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -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)
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 {
OpenPOWER on IntegriCloud