diff options
author | billf <billf@FreeBSD.org> | 1999-08-11 20:55:42 +0000 |
---|---|---|
committer | billf <billf@FreeBSD.org> | 1999-08-11 20:55:42 +0000 |
commit | a66efa8a50ef6e86cfd5a817c3a780eb7aabcb6f (patch) | |
tree | da1f219cf87766dbc52ec8825d8c42d04d25af94 /usr.sbin/pkg_install/lib | |
parent | d19c9420bdbe3994d009eae3c7fd581d485f3917 (diff) | |
download | FreeBSD-src-a66efa8a50ef6e86cfd5a817c3a780eb7aabcb6f.zip FreeBSD-src-a66efa8a50ef6e86cfd5a817c3a780eb7aabcb6f.tar.gz |
-Wall fixes. Ambigious if/elses, uninitialized values, missing headers,
missing prototypes, and empty format strings.
Diffstat (limited to 'usr.sbin/pkg_install/lib')
-rw-r--r-- | usr.sbin/pkg_install/lib/lib.h | 3 | ||||
-rw-r--r-- | usr.sbin/pkg_install/lib/plist.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h index 595b2a1..f4d839c 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 d18c543..ac708d9 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; |