From 0845a96cd0c2cd328c36b72812979b47f39f38b5 Mon Sep 17 00:00:00 2001
From: Bill Fumerola <billf@FreeBSD.org>
Date: Wed, 11 Aug 1999 20:55:42 +0000
Subject: -Wall fixes. Ambigious if/elses, uninitialized values, missing
 headers, missing prototypes, and empty format strings.

---
 usr.sbin/pkg_install/lib/lib.h   | 3 ++-
 usr.sbin/pkg_install/lib/plist.c | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'usr.sbin/pkg_install/lib')

diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index 595b2a1c2f7f..f4d839cf914a 100644
--- a/usr.sbin/pkg_install/lib/lib.h
+++ b/usr.sbin/pkg_install/lib/lib.h
@@ -1,4 +1,4 @@
-/* $Id: lib.h,v 1.26 1998/02/16 17:16:47 jkh Exp $ */
+/* $Id: lib.h,v 1.27 1998/12/16 13:59:31 jkh Exp $ */
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -165,6 +165,7 @@ void		write_plist(Package *, FILE *);
 void		read_plist(Package *, FILE *);
 int		plist_cmd(char *, char **);
 int		delete_package(Boolean, Boolean, Package *);
+Boolean 	make_preserve_name(char *, int, char *, char *);
 
 /* For all */
 int		pkg_perform(char **);
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
index d18c543723ae..ac708d98173a 100644
--- a/usr.sbin/pkg_install/lib/plist.c
+++ b/usr.sbin/pkg_install/lib/plist.c
@@ -1,6 +1,6 @@
 #ifndef lint
 static const char rcsid[] =
-	"$Id: plist.c,v 1.26 1998/09/01 06:58:11 jkh Exp $";
+	"$Id: plist.c,v 1.27 1998/09/11 07:26:58 jkh Exp $";
 #endif
 
 /*
@@ -493,11 +493,12 @@ delete_hierarchy(char *dir, Boolean ign_err, Boolean nukedirs)
 	    *cp2 = '\0';
 	if (!isemptydir(dir))
 	    return 0;
-	if (RMDIR(dir) && !ign_err)
+	if (RMDIR(dir) && !ign_err) {
 	    if (!fexists(dir))
 		warnx("directory `%s' doesn't really exist", dir);
 	    else
 		return 1;
+	}
 	/* back up the pathname one component */
 	if (cp2) {
 	    cp1 = dir;
-- 
cgit v1.3