diff options
| author | jschauma <jschauma> | 2003-01-07 16:43:56 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2003-01-07 16:43:56 +0000 |
| commit | 0d037ee257f89dc8230ca7162a7cd8e9edf00872 (patch) | |
| tree | 68fbc023a35ea2e5f6a3157b3cb7eb39e0fc1f1e /pkgtools/pkg_install/files/admin | |
| parent | 63e6a7b88da458df7349cee35a6f16b013c2a634 (diff) | |
| download | pkgsrc-0d037ee257f89dc8230ca7162a7cd8e9edf00872.tar.gz | |
``On second thought, let's not go to Camelot. It is a silly place.''
(Make pkdb_open return pkgdbp!=NULL as src's does, and revert previous
patch. As discussed with agc.)
Diffstat (limited to 'pkgtools/pkg_install/files/admin')
| -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 a3a6155550e..93869ddf05c 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.3 2003/01/07 16:10:02 jschauma Exp $ */ +/* $NetBSD: main.c,v 1.4 2003/01/07 16:43:56 jschauma Exp $ */ #if 0 #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: main.c,v 1.3 2003/01/07 16:10:02 jschauma Exp $"); +__RCSID("$NetBSD: main.c,v 1.4 2003/01/07 16:43:56 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) == -1) + if (!pkgdb_open(ReadWrite)) 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) == -1) { + if (!pkgdb_open(ReadOnly)) { 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) == -1) + if (!pkgdb_open(ReadWrite)) 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) == -1) { + if (!pkgdb_open(ReadWrite)) { err(EXIT_FAILURE, "cannot open pkgdb"); } |