From 99fcb8e39e1ae71bc82b7f6eec14aa4d42446b21 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Thu, 19 Aug 2004 21:36:46 +0000
Subject: [PATCH] - use WARNS?= 6 instead of a hard-wired list. -pedantic
 doesn't really work   anyway (no long long) - use sys/param.h for nhtl in
 kgzcmp.c - don't cast away const in kgzip.c, correct the usage of malloc'd
 space   instead

---
 usr.sbin/kgzip/Makefile |  8 ++------
 usr.sbin/kgzip/kgzcmp.c |  4 ++--
 usr.sbin/kgzip/kgzip.c  | 24 ++++++++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/usr.sbin/kgzip/Makefile b/usr.sbin/kgzip/Makefile
index ecb8715fd7..88074af6bb 100644
--- a/usr.sbin/kgzip/Makefile
+++ b/usr.sbin/kgzip/Makefile
@@ -1,13 +1,9 @@
 # $FreeBSD: src/usr.sbin/kgzip/Makefile,v 1.2.2.2 2001/07/19 04:37:24 kris Exp $
-# $DragonFly: src/usr.sbin/kgzip/Makefile,v 1.2 2003/06/17 04:29:55 dillon Exp $
+# $DragonFly: src/usr.sbin/kgzip/Makefile,v 1.3 2004/08/19 21:36:46 joerg Exp $
 
 PROG=	kgzip
 SRCS=	kgzip.c aouthdr.c elfhdr.c kgzcmp.c kgzld.c xio.c
 MAN=	kgzip.8
-CFLAGS+=-pedantic \
-	-W -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
-	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-	-Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes \
-	-Wwrite-strings
+WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/kgzip/kgzcmp.c b/usr.sbin/kgzip/kgzcmp.c
index 70391b1cd8..7c5d22187f 100644
--- a/usr.sbin/kgzip/kgzcmp.c
+++ b/usr.sbin/kgzip/kgzcmp.c
@@ -24,10 +24,10 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/kgzip/kgzcmp.c,v 1.2.2.3 2001/07/19 04:37:24 kris Exp $
- * $DragonFly: src/usr.sbin/kgzip/kgzcmp.c,v 1.3 2003/11/16 15:17:36 eirikn Exp $
+ * $DragonFly: src/usr.sbin/kgzip/kgzcmp.c,v 1.4 2004/08/19 21:36:46 joerg Exp $
  */
 
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <machine/elf.h>
diff --git a/usr.sbin/kgzip/kgzip.c b/usr.sbin/kgzip/kgzip.c
index 43d44bc63c..d3fd15336b 100644
--- a/usr.sbin/kgzip/kgzip.c
+++ b/usr.sbin/kgzip/kgzip.c
@@ -24,7 +24,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/kgzip/kgzip.c,v 1.3.2.3 2001/07/19 04:42:38 kris Exp $
- * $DragonFly: src/usr.sbin/kgzip/kgzip.c,v 1.2 2003/06/17 04:29:55 dillon Exp $
+ * $DragonFly: src/usr.sbin/kgzip/kgzip.c,v 1.3 2004/08/19 21:36:46 joerg Exp $
  */
 
 #include <sys/types.h>
@@ -52,7 +52,7 @@ int format;			/* Output format */
 char *tname;			/* Name of temporary file */
 
 static void cleanup(void);
-static void mk_fn(int, const char *, const char *, char *[]);
+static void mk_fn(int, const char *, const char *, const char *[]);
 static void usage(void);
 
 /*
@@ -61,7 +61,7 @@ static void usage(void);
 int
 main(int argc, char *argv[])
 {
-    static char *fn[FN_CNT];
+    static const char *fn[FN_CNT];
     struct kgz_hdr kh;
     const char *output;
     char *tmpdir;
@@ -132,9 +132,10 @@ cleanup(void)
  * Make the required filenames.
  */
 static void
-mk_fn(int cflag, const char *f1, const char *f2, char *fn[])
+mk_fn(int cflag, const char *f1, const char *f2, const char *fn[])
 {
     const char *p, *s;
+    char *sfx;
     size_t n;
     int i, fd;
 
@@ -145,20 +146,23 @@ mk_fn(int cflag, const char *f1, const char *f2, char *fn[])
 	s -= n;
 	i++;
     }
-    fn[i++] = (char *)f1;
+    fn[i++] = f1;
     if (i == FN_OBJ && !cflag) {
 	if ((fd = mkstemp(tname)) == -1)
 	    err(1, NULL);
 	close(fd);
-	fn[i++] = (char *)tname;
+	fn[i++] = tname;
     }
-    if (!(fn[i] = (char *)f2)) {
+    fn[i] = f2;
+    if (fn[i] == NULL) {
 	p = (p = strrchr(f1, '/')) ? p + 1 : f1;
 	n = (size_t)(s - p);
-	if (!(fn[i] = malloc(n + SFX_MAX)))
+	sfx = malloc(n + SFX_MAX);
+	if (sfx == NULL)
 	    err(1, NULL);
-	memcpy(fn[i], p, n);
-	strcpy(fn[i] + n, i == FN_OBJ ? SFX_OBJ : SFX_KGZ);
+	memcpy(sfx, p, n);
+	strcpy(sfx + n, i == FN_OBJ ? SFX_OBJ : SFX_KGZ);
+	fn[i] = sfx;
     }
 }
 
-- 
2.39.1