WARNS=2 cleanup.

Tested on:	i386, alpha
MFC after:	2 weeks

4 files changed, 28 insertions, 25 deletions

diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index b249610..5bf59f0 100644
--- a/usr.sbin/pkg_install/create/Makefile
+++ b/usr.sbin/pkg_install/create/Makefile
@@ -5,6 +5,8 @@ SRCS=	main.c perform.c pl.c
 
 CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib
 
+WARNS?=	2
+
 DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
 LDADD=	${LIBINSTALL} -lfetch -lmd
 
diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h
index d85e28a..17d8266 100644
--- a/usr.sbin/pkg_install/create/create.h
+++ b/usr.sbin/pkg_install/create/create.h
@@ -44,8 +44,8 @@ extern int	Dereference;
 extern int	PlistOnly;
 extern int	UseBzip2;
 
-void		check_list(char *, Package *);
+void		check_list(const char *, Package *);
 int		pkg_perform(char **);
-void		copy_plist(char *, Package *);
+void		copy_plist(const char *, Package *);
 
 #endif	/* _INST_CREATE_H_INCLUDE */
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
index 1dae50b..cd1f8a5 100644
--- a/usr.sbin/pkg_install/create/perform.c
+++ b/usr.sbin/pkg_install/create/perform.c
@@ -34,8 +34,8 @@ static const char rcsid[] =
 #include <unistd.h>
 
 static void sanity_check(void);
-static void make_dist(char *, char *, char *, Package *);
-static int create_from_installed(char *, char *);
+static void make_dist(const char *, const char *, const char *, Package *);
+static int create_from_installed(const char *, const char *);
 
 static char *home;
 
@@ -47,7 +47,7 @@ pkg_perform(char **pkgs)
     FILE *pkg_in, *fp;
     Package plist;
     int len;
-    char *suf;
+    const char *suf;
     int compress = TRUE;	/* default is to compress packages */
 
     /* Preliminary setup */
@@ -258,29 +258,29 @@ pkg_perform(char **pkgs)
 }
 
 static void
-make_dist(char *home, char *pkg, char *suffix, Package *plist)
+make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist)
 {
     char tball[FILENAME_MAX];
     PackingList p;
     int ret;
-    char *args[50];	/* Much more than enough. */
+    const char *args[50];	/* Much more than enough. */
     int nargs = 0;
     int pipefds[2];
     FILE *totar;
     pid_t pid;
-    char *cname;
+    const char *cname;
 
     args[nargs++] = "tar";	/* argv[0] */
 
     if (*pkg == '/')
-	snprintf(tball, FILENAME_MAX, "%s.%s", pkg, suffix);
+	snprintf(tball, FILENAME_MAX, "%s.%s", pkg, suff);
     else
-	snprintf(tball, FILENAME_MAX, "%s/%s.%s", home, pkg, suffix);
+	snprintf(tball, FILENAME_MAX, "%s/%s.%s", homedir, pkg, suff);
 
     args[nargs++] = "-c";
     args[nargs++] = "-f";
     args[nargs++] = tball;
-    if (strchr(suffix, 'z')) {	/* Compress/gzip/bzip2? */
+    if (strchr(suff, 'z')) {	/* Compress/gzip/bzip2? */
 	if (UseBzip2) {
 	    args[nargs++] = "-y";
 	    cname = "bzip'd ";
@@ -318,7 +318,7 @@ make_dist(char *home, char *pkg, char *suffix, Package *plist)
 	dup2(pipefds[0], 0);
 	close(pipefds[0]);
 	close(pipefds[1]);
-	execv("/usr/bin/tar", args);
+	execv("/usr/bin/tar", (char * const *)(uintptr_t)args);
 	cleanup(0);
 	errx(2, __FUNCTION__ ": failed to execute tar command");
     }
@@ -400,18 +400,18 @@ cleanup(int sig)
 }
 
 static int
-create_from_installed(char *pkg, char *suf)
+create_from_installed(const char *pkg, const char *suf)
 {
     FILE *fp;
     Package plist;
-    char home[MAXPATHLEN], log_dir[FILENAME_MAX];
+    char homedir[MAXPATHLEN], log_dir[FILENAME_MAX];
 
     snprintf(log_dir, sizeof(log_dir), "%s/%s", LOG_DIR, InstalledPkg);
     if (!fexists(log_dir)) {
 	warnx("can't find package '%s' installed!", InstalledPkg);
 	return 1;
     }
-    getcwd(home, sizeof(home));
+    getcwd(homedir, sizeof(homedir));
     if (chdir(log_dir) == FAIL) {
 	warnx("can't change directory to '%s'!", log_dir);
 	return 1;
@@ -427,7 +427,7 @@ create_from_installed(char *pkg, char *suf)
     read_plist(&plist, fp);
     fclose(fp);
 
-    make_dist(home, pkg, suf, &plist);
+    make_dist(homedir, pkg, suf, &plist);
 
     free_plist(&plist);
     return TRUE;
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
index 02bb87b..028b49c 100644
--- a/usr.sbin/pkg_install/create/pl.c
+++ b/usr.sbin/pkg_install/create/pl.c
@@ -31,10 +31,10 @@ static const char rcsid[] =
 
 /* Check a list for files that require preconversion */
 void
-check_list(char *home, Package *pkg)
+check_list(const char *home, Package *pkg)
 {
-    char *where = home;
-    char *there = NULL;
+    const char *where = home;
+    const char *there = NULL;
     char *cp, name[FILENAME_MAX], buf[33];
     PackingList p;
 
@@ -86,9 +86,9 @@ trylink(const char *from, const char *to)
 }
 
 #define STARTSTRING "tar cf -"
-#define TOOBIG(str) strlen(str) + 6 + strlen(home) + where_count > maxargs
+#define TOOBIG(str) (int)strlen(str) + 6 + (int)strlen(home) + where_count > maxargs
 #define PUSHOUT() /* push out string */ \
-	if (where_count > sizeof(STARTSTRING)-1) { \
+	if (where_count > (int)sizeof(STARTSTRING)-1) { \
 		    strcat(where_args, "|tar xpf -"); \
 		    if (system(where_args)) { \
 			cleanup(0); \
@@ -105,12 +105,13 @@ trylink(const char *from, const char *to)
  * have already been copied in an earlier pass through the list.
  */
 void
-copy_plist(char *home, Package *plist)
+copy_plist(const char *home, Package *plist)
 {
     PackingList p = plist->head;
-    char *where = home;
-    char *there = NULL, *mythere;
-    char *where_args, *last_chdir, *root = "/";
+    const char *where = home;
+    const char *there = NULL, *mythere;
+    char *where_args;
+    const char *last_chdir, *root = "/";
     int maxargs, where_count = 0, add_count;
     struct stat stb;
     dev_t curdir;