[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Remove the remaining tr...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b010b80bce14
branches:  trunk
changeset: 553928:b010b80bce14
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 03 13:49:56 2009 +0000

description:
Remove the remaining trails of HAVE_DBLIB.

diffstat:

 pkgtools/pkg_install/files/lib/pkgdb.c |  24 ++----------------------
 1 files changed, 2 insertions(+), 22 deletions(-)

diffs (63 lines):

diff -r 1a15bab9037d -r b010b80bce14 pkgtools/pkg_install/files/lib/pkgdb.c
--- a/pkgtools/pkg_install/files/lib/pkgdb.c    Tue Feb 03 13:45:23 2009 +0000
+++ b/pkgtools/pkg_install/files/lib/pkgdb.c    Tue Feb 03 13:49:56 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkgdb.c,v 1.32 2009/02/03 13:18:03 joerg Exp $ */
+/*     $NetBSD: pkgdb.c,v 1.33 2009/02/03 13:49:56 joerg Exp $ */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pkgdb.c,v 1.32 2009/02/03 13:18:03 joerg Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.33 2009/02/03 13:49:56 joerg Exp $");
 
 /*-
  * Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
@@ -65,11 +65,6 @@
 #if HAVE_STRING_H
 #include <string.h>
 #endif
-#if defined(HAVE_DBOPEN) || (defined(HAVE___DB185_OPEN) && defined(HAVE_DB_185_H))
-#define        HAVE_DBLIB      1
-#else
-#define        HAVE_DBLIB      0
-#endif
 
 #include "lib.h"
 
@@ -85,13 +80,10 @@
 /* just in case we change the environment variable name */
 #define PKG_DBDIR              "PKG_DBDIR"
 
-#if HAVE_DBLIB
 static DB   *pkgdbp;
-#endif
 static char *pkgdb_dir = NULL;
 static char  pkgdb_cache[MaxPathSize];
 
-#if HAVE_DBLIB
 /*
  *  Open the pkg-database
  *  Return value:
@@ -272,18 +264,6 @@
        return ret;
 }
 
-#else /* !HAVE_DBLIB */
-
-int    pkgdb_open(int mode) { return 1; }
-void   pkgdb_close(void) {}
-int    pkgdb_store(const char *key, const char *val) { return 0; }
-char   *pkgdb_retrieve(const char *key) { return NULL; }
-int    pkgdb_dump(void) { return 0; }
-int    pkgdb_remove(const char *key) { return 0; }
-int    pkgdb_remove_pkg(const char *pkg) { return 1; }
-
-#endif /* HAVE_DBLIB */
-
 /*
  *  Return the location of the package reference counts database directory.
  */