diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-01-07 16:10:02 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-01-07 16:10:02 +0000 |
| commit | 37f8100ca0eb8bc3250e1f48e27ee95b72422751 (patch) | |
| tree | cb0150fe5101d7c84901b279f5b730664f8f7744 /pkgtools/pkg_install/files/admin/main.c | |
| parent | 9eb59bb721d7c9e48350ce39a5f130ae97167b3e (diff) | |
| download | pkgsrc-37f8100ca0eb8bc3250e1f48e27ee95b72422751.tar.gz | |
Unlike pkg_install in src, this version of pkg_install contains
a pkgdb_open that may return one of _three_ values (0,1,-1), so that
we can not simply use
if (!pkgdb_open(ReadOnly))
but need to use
if (pkgdb_open(ReadOnly) == -1)
Mea culpa.
Diffstat (limited to 'pkgtools/pkg_install/files/admin/main.c')
| -rw-r--r-- | pkgtools/pkg_install/files/admin/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/files/admin/main.c b/pkgtools/pkg_install/files/admin/main.c index 2ff9d2d66f4..a3a6155550e 100644 --- a/pkgtools/pkg_install/files/admin/main.c +++ b/pkgtools/pkg_install/files/admin/main.c @@ -1,9 +1,9 @@ -/* $NetBSD: main.c,v 1.2 2003/01/06 04:34:16 jschauma Exp $ */ +/* $NetBSD: main.c,v 1.3 2003/01/07 16:10:02 jschauma Exp $ */ #if 0 #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: main.c,v 1.2 2003/01/06 04:34:16 jschauma Exp $"); +__RCSID("$NetBSD: main.c,v 1.3 2003/01/07 16:10:02 jschauma Exp $"); #endif #endif @@ -192,7 +192,7 @@ rebuild(void) if (unlink(_pkgdb_getPKGDB_FILE(cachename, sizeof(cachename))) != 0 && errno != ENOENT) err(EXIT_FAILURE, "unlink %s", cachename); - if (!pkgdb_open(ReadWrite)) + if (pkgdb_open(ReadWrite) == -1) err(EXIT_FAILURE, "cannot open pkgdb"); setbuf(stdout, NULL); @@ -546,7 +546,7 @@ main(int argc, char *argv[]) printf("Dumping pkgdb %s:\n", _pkgdb_getPKGDB_FILE(cachename, sizeof(cachename))); - if (!pkgdb_open(ReadOnly)) { + if (pkgdb_open(ReadOnly) == -1) { err(EXIT_FAILURE, "cannot open %s", cachename); } while ((key = pkgdb_iter())) { @@ -563,7 +563,7 @@ main(int argc, char *argv[]) int rc; - if (!pkgdb_open(ReadWrite)) + if (pkgdb_open(ReadWrite) == -1) err(EXIT_FAILURE, "cannot open pkgdb"); rc = pkgdb_remove(argv[2]); @@ -580,7 +580,7 @@ main(int argc, char *argv[]) int rc; - if (!pkgdb_open(ReadWrite)) { + if (pkgdb_open(ReadWrite) == -1) { err(EXIT_FAILURE, "cannot open pkgdb"); } |