summaryrefslogtreecommitdiff
path: root/usr.bin/cut
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>1999-01-21 00:55:32 +0000
committercvs2svn <cvs2svn@FreeBSD.org>1999-01-21 00:55:32 +0000
commit76b5366091f76c9bc73570149ef5055648fc2c39 (patch)
tree590d020e0f2a5bea6e09d66d951a674443b21d67 /usr.bin/cut
parent4b4d01da6f07f7754ff6a6e4f5223e9f0984d1a6 (diff)
This commit was manufactured by cvs2svn to create tagrelease/3.0.0
'RELENG_3_0_0_RELEASE'.
Diffstat (limited to 'usr.bin/cut')
-rw-r--r--usr.bin/cut/Makefile1
-rw-r--r--usr.bin/cut/cut.c10
2 files changed, 5 insertions, 6 deletions
diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile
index a3467c80ea78..19b01009cede 100644
--- a/usr.bin/cut/Makefile
+++ b/usr.bin/cut/Makefile
@@ -1,6 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= cut
-CFLAGS+=-Wall
.include <bsd.prog.mk>
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index 168e7b626d4e..cc57685ead21 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -35,13 +35,13 @@
*/
#ifndef lint
-static const char copyright[] =
+static char copyright[] =
"@(#) Copyright (c) 1989, 1993\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
-static const char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
#endif /* not lint */
#include <ctype.h>
@@ -70,7 +70,7 @@ main(argc, argv)
char *argv[];
{
FILE *fp;
- void (*fcn) __P((FILE *, char *)) = NULL;
+ void (*fcn) __P((FILE *, char *));
int ch;
dchar = '\t'; /* default delimiter is \t */
@@ -139,7 +139,7 @@ get_list(list)
* overlapping lists. We also handle "-3-5" although there's no
* real reason too.
*/
- for (; (p = strtok(list, ", \t")); list = NULL) {
+ for (; p = strtok(list, ", \t"); list = NULL) {
setautostart = start = stop = 0;
if (*p == '-') {
++p;
@@ -186,7 +186,7 @@ c_cut(fp, fname)
FILE *fp;
char *fname;
{
- register int ch = 0, col;
+ register int ch, col;
register char *pos;
for (;;) {