From 43419a069b86c69d0f20bf553aa3b6b57bd63c25 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Thu, 11 May 2006 23:50:15 +0000
Subject: [PATCH] sprinkle a little (char *) to quell GCC4.

---
 usr.sbin/pkg_install/add/extract.c    | 6 +++---
 usr.sbin/pkg_install/create/perform.c | 6 +++---
 usr.sbin/pkg_install/lib/file.c       | 6 +++---
 usr.sbin/pkg_install/lib/ftpio.c      | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c
index d092134c7007..4612f7cb25ca 100644
--- a/usr.sbin/pkg_install/add/extract.c
+++ b/usr.sbin/pkg_install/add/extract.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: extract.c,v 1.37 2005/11/23 04:59:14 ben Exp $	*/
+/*	$NetBSD: extract.c,v 1.38 2006/05/11 23:50:15 mrg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -14,7 +14,7 @@
 #if 0
 static const char *rcsid = "FreeBSD - Id: extract.c,v 1.17 1997/10/08 07:45:35 charnier Exp";
 #else
-__RCSID("$NetBSD: extract.c,v 1.37 2005/11/23 04:59:14 ben Exp $");
+__RCSID("$NetBSD: extract.c,v 1.38 2006/05/11 23:50:15 mrg Exp $");
 #endif
 #endif
 
@@ -62,7 +62,7 @@ pushout(char *todir)
 	int			count;
 
 	/* set up arguments to run "pax -r -w -p e" */
-	file_args[0] = strrchr(PAX_CMD, '/');
+	file_args[0] = (char *)strrchr(PAX_CMD, '/');
 	if (file_args[0] == NULL)
 		file_args[0] = PAX_CMD;
 	else
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index a069758b489e..0f6ed613c9fa 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.43 2005/11/23 04:59:14 ben Exp $	*/
+/*	$NetBSD: perform.c,v 1.44 2006/05/11 23:50:15 mrg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.38 1997/10/13 15:03:51 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.43 2005/11/23 04:59:14 ben Exp $");
+__RCSID("$NetBSD: perform.c,v 1.44 2006/05/11 23:50:15 mrg Exp $");
 #endif
 #endif
 
@@ -65,7 +65,7 @@ make_dist(const char *home, const char *pkg, const char *suffix, const package_t
 	FILE   *totar;
 	pipe_to_system_t	*to_pipe;
 
-	if ((args[0] = strrchr(TAR_CMD, '/')) == NULL)
+	if ((args[0] = (char *)strrchr(TAR_CMD, '/')) == NULL)
 		args[0] = TAR_CMD;
 	else
 		args[0]++;
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
index e7655649d355..ea52dc5c9667 100644
--- a/usr.sbin/pkg_install/lib/file.c
+++ b/usr.sbin/pkg_install/lib/file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: file.c,v 1.77 2006/03/26 18:11:22 christos Exp $	*/
+/*	$NetBSD: file.c,v 1.78 2006/05/11 23:50:15 mrg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -17,7 +17,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp";
 #else
-__RCSID("$NetBSD: file.c,v 1.77 2006/03/26 18:11:22 christos Exp $");
+__RCSID("$NetBSD: file.c,v 1.78 2006/05/11 23:50:15 mrg Exp $");
 #endif
 #endif
 
@@ -651,7 +651,7 @@ unpack(const char *pkg, const lfile_head_t *filesp)
 	} else
 		decompress_cmd = GZIP_CMD;
 
-	up_argv[i] = strrchr(TAR_CMD, '/');
+	up_argv[i] = (char *)strrchr(TAR_CMD, '/');
 	if (up_argv[i] == NULL)
 		up_argv[i] = TAR_CMD;
 	else
diff --git a/usr.sbin/pkg_install/lib/ftpio.c b/usr.sbin/pkg_install/lib/ftpio.c
index 1a76dfcd850d..999b2e8db185 100644
--- a/usr.sbin/pkg_install/lib/ftpio.c
+++ b/usr.sbin/pkg_install/lib/ftpio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftpio.c,v 1.72 2006/04/18 13:11:05 hubertf Exp $	*/
+/*	$NetBSD: ftpio.c,v 1.73 2006/05/11 23:50:15 mrg Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.72 2006/04/18 13:11:05 hubertf Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.73 2006/05/11 23:50:15 mrg Exp $");
 #endif
 
 /*-
@@ -347,7 +347,7 @@ setupCoproc(const char *base)
 	int answer_pipe[2];
 	int rc1, rc2;
 	char buf[20];
-	char *argv0 = strrchr(FTP_CMD, '/');
+	char *argv0 = (char *)strrchr(FTP_CMD, '/');
 	if (argv0 == NULL)
 		argv0 = FTP_CMD;
 	else