Use dpkg_db_set_dir() instead of pkgadmindir_init()

Remove now unused pkgadmindir_init().

8 files changed, 12 insertions, 21 deletions

diff --git a/dselect/main.cc b/dselect/main.cc
index f40f66cb0..ad2d46809 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -518,6 +518,8 @@ main(int, const char *const *argv)
   loadcfgfile(DSELECT, cmdinfos);
   myopt(&argv,cmdinfos);
 
+  admindir = dpkg_db_set_dir(admindir);
+
   if (*argv) {
     const char *a;
     while ((a= *argv++) != 0) {
diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c
index a844d8a6e..453711f8e 100644
--- a/lib/dpkg/dbmodify.c
+++ b/lib/dpkg/dbmodify.c
@@ -426,18 +426,6 @@ modstatdb_note_ifwrite(struct pkginfo *pkg)
 }
 
 const char *
-pkgadmindir_init(const char *default_dir)
-{
-  const char *env;
-
-  env = getenv("DPKG_ADMINDIR");
-  if (env)
-    return env;
-  else
-    return default_dir;
-}
-
-const char *
 pkgadmindir(void)
 {
   return infodir;
diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index 7f81d0913..8db647d8f 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/lib/dpkg/dpkg-db.h
@@ -240,7 +240,6 @@ void modstatdb_note_ifwrite(struct pkginfo *pkg);
 void modstatdb_checkpoint(void);
 void modstatdb_shutdown(void);
 
-const char *pkgadmindir_init(const char *default_dir);
 const char *pkgadmindir(void);
 const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile);
 
diff --git a/src/divertcmd.c b/src/divertcmd.c
index 05d5180aa..0c0d21383 100644
--- a/src/divertcmd.c
+++ b/src/divertcmd.c
@@ -710,11 +710,11 @@ main(int argc, const char * const *argv)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	admindir = pkgadmindir_init(ADMINDIR);
-
 	standard_startup();
 	myopt(&argv, cmdinfos);
 
+	admindir = dpkg_db_set_dir(admindir);
+
 	env_pkgname = getenv("DPKG_MAINTSCRIPT_PACKAGE");
 	if (opt_pkgname_match_any && env_pkgname)
 		setpackage(NULL, env_pkgname);
diff --git a/src/main.c b/src/main.c
index 3bead4290..cfa0e7a72 100644
--- a/src/main.c
+++ b/src/main.c
@@ -734,6 +734,8 @@ int main(int argc, const char *const *argv) {
 
   if (!cipaction) badusage(_("need an action option"));
 
+  admindir = dpkg_db_set_dir(admindir);
+
   /* Always set environment, to avoid possible security risks. */
   if (setenv("DPKG_ADMINDIR", admindir, 1) < 0)
     ohshite(_("unable to setenv for subprocesses"));
diff --git a/src/querycmd.c b/src/querycmd.c
index 5e2257e4c..ef4692d23 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -681,11 +681,11 @@ int main(int argc, const char *const *argv) {
   bindtextdomain(PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
 
-  admindir = pkgadmindir_init(ADMINDIR);
-
   standard_startup();
   myopt(&argv, cmdinfos);
 
+  admindir = dpkg_db_set_dir(admindir);
+
   if (!cipaction) badusage(_("need an action option"));
 
   setvbuf(stdout, NULL, _IONBF, 0);
diff --git a/src/statcmd.c b/src/statcmd.c
index d3d5d2b95..02933a9c9 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -369,11 +369,11 @@ main(int argc, const char *const *argv)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	admindir = pkgadmindir_init(ADMINDIR);
-
 	standard_startup();
 	myopt(&argv, cmdinfos);
 
+	admindir = dpkg_db_set_dir(admindir);
+
 	if (!cipaction)
 		badusage(_("need an action option"));
 
diff --git a/src/trigcmd.c b/src/trigcmd.c
index f4d4e6d35..b7fa396a5 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -188,11 +188,11 @@ main(int argc, const char *const *argv)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	admindir = pkgadmindir_init(ADMINDIR);
-
 	standard_startup();
 	myopt(&argv, cmdinfos);
 
+	admindir = dpkg_db_set_dir(admindir);
+
 	setvbuf(stdout, NULL, _IONBF, 0);
 
 	if (f_check) {