summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-02-03 13:49:56 +0000
committerjoerg <joerg@pkgsrc.org>2009-02-03 13:49:56 +0000
commit97f4088f5d42e039d93ce38198b8c20454f2071c (patch)
treedb1b121ff0ca183aa6504369789db7b47d53389d /pkgtools
parent55db3e264a83897770e7b5dce783338e31c181d7 (diff)
downloadpkgsrc-97f4088f5d42e039d93ce38198b8c20454f2071c.tar.gz
Remove the remaining trails of HAVE_DBLIB.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_install/files/lib/pkgdb.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/pkgtools/pkg_install/files/lib/pkgdb.c b/pkgtools/pkg_install/files/lib/pkgdb.c
index c19bb9990fc..e319e039139 100644
--- a/pkgtools/pkg_install/files/lib/pkgdb.c
+++ b/pkgtools/pkg_install/files/lib/pkgdb.c
@@ -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 @@ __RCSID("$NetBSD: pkgdb.c,v 1.32 2009/02/03 13:18:03 joerg Exp $");
#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 @@ __RCSID("$NetBSD: pkgdb.c,v 1.32 2009/02/03 13:18:03 joerg Exp $");
/* 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 @@ pkgdb_remove_pkg(const char *pkg)
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.
*/