From 41ff7633eac20e0d2827c596e9b809c78298ff5a Mon Sep 17 00:00:00 2001
From: Dima Dorfman
Date: Thu, 7 Jun 2001 02:57:58 +0000
Subject: [PATCH] Silence the remaining warnings and clamp down with WARNS=2.
Not objected to by: -audit
---
usr.bin/cut/Makefile | 4 +++-
usr.bin/cut/cut.c | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile
index a3467c80ea7..2a957fadfc6 100644
--- a/usr.bin/cut/Makefile
+++ b/usr.bin/cut/Makefile
@@ -1,6 +1,8 @@
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
+# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
+# $FreeBSD$
PROG= cut
CFLAGS+=-Wall
+WARNS?= 2
.include
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index 373ff4aa2e9..bb7f51f4736 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -172,8 +172,8 @@ get_list(list)
if (!stop || !start)
errx(1, "[-cf] list: values may not include zero");
if (stop > _POSIX2_LINE_MAX)
- errx(1, "[-cf] list: %d too large (max %d)",
- stop, _POSIX2_LINE_MAX);
+ errx(1, "[-cf] list: %ld too large (max %d)",
+ (long)stop, _POSIX2_LINE_MAX);
if (maxval < stop)
maxval = stop;
for (pos = positions + start; start++ <= stop; *pos++ = 1);
@@ -223,7 +223,7 @@ c_cut(fp, fname)
void
f_cut(fp, fname)
FILE *fp;
- const char *fname;
+ const char *fname __unused;
{
int ch, field, isdelim;
char *pos, *p, sep;