Move duplicate pkgadminfile functions to lib/dbmodify.c

diff --git a/ChangeLog b/ChangeLog
index 51d972fc2b48022dced58dffcb7e87e6ebe8df99..02345a74af49bb307848911a38bf2a175f3ba503 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-20  Ian Jackson  <ian@davenant.greenend.org.uk>
+
+       * src/main.h (pkgadminfile): Move prototype to ...
+       * lib/dpkg-db.h: ... here.
+       * src/help.c (pkgadminfile): Move function definition to ...
+       * lib/dbmodify.c: ... here.
+       * src/query.c (pkgadminfile): Remove duplicated functions.
+
 2008-03-20  Ian Jackson  <ian@davenant.greenend.org.uk>,
             Guillem Jover  <guillem@debian.org>
 

diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index cfc95cabb35e20e67718ec15fa077687f6e091c1..ba85037f59fd8d60c8606e81389f530e5ab17ebe 100644 (file)
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -288,6 +288,18 @@ void modstatdb_note(struct pkginfo *pkg) {
   onerr_abort--;
 }
 
+const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile) {
+  static struct varbuf vb;
+  varbufreset(&vb);
+  varbufaddstr(&vb,admindir);
+  varbufaddstr(&vb,"/" INFODIR);
+  varbufaddstr(&vb,pkg->name);
+  varbufaddc(&vb,'.');
+  varbufaddstr(&vb,whichfile);
+  varbufaddc(&vb,0);
+  return vb.buf;
+}
+
 const char *log_file= NULL;
 
 void log_message(const char *fmt, ...) {

diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index 9f8de44ea8f159a2ddf05ee90dcbfd2913be3024..c306f3bf7ea8c374044442c011f17edec0dcbbda 100644 (file)
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -175,6 +175,8 @@ void modstatdb_shutdown(void);
 
 extern char *statusfile, *availablefile; /* initialised by modstatdb_init */
 
+const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile);
+
 extern const char *log_file;
 void log_message(const char *fmt, ...) PRINTFFORMAT(1, 2);
 

diff --git a/src/help.c b/src/help.c
index 5103ecb83afa54c2a523288bee88335ddfebfc62..d7f2f04016ba1bc67f448cd4e5a1c1f4c103dbb0 100644 (file)
--- a/src/help.c
+++ b/src/help.c
@@ -144,18 +144,6 @@ int force_conflicts(struct deppossi *possi) {
   return fc_conflicts;
 }
 
-const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile) {
-  static struct varbuf vb;
-  varbufreset(&vb);
-  varbufaddstr(&vb,admindir);
-  varbufaddstr(&vb,"/" INFODIR);
-  varbufaddstr(&vb,pkg->name);
-  varbufaddc(&vb,'.');
-  varbufaddstr(&vb,whichfile);
-  varbufaddc(&vb,0);
-  return vb.buf;
-}
-
 static const char* preexecscript(const char *path, char *const *argv) {
   /* returns the path to the script inside the chroot
    * none of the stuff here will work if admindir isn't inside instdir

diff --git a/src/main.h b/src/main.h
index 59cc9f85a55effd3f8faf62c2e2b6c8d44e90782..a490e8d428a6f14179f7ea7a7bb465465e13c03a 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -182,7 +182,6 @@ int force_conff_new(struct deppossi *possi);
 int force_conff_miss(struct deppossi *possi);
 int force_conflicts(struct deppossi *possi);
 void ensure_package_clientdata(struct pkginfo *pkg);
-const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile);
 void oldconffsetflags(const struct conffile *searchconff);
 void ensure_pathname_nonexisting(const char *pathname);
 int chmodsafe_unlink(const char *pathname, const char **failed);

diff --git a/src/query.c b/src/query.c
index 91b9111e6131c8bc382a8744fc0b3502d8ce15a4..c50ddded9209d654f306402a60b7afcc588c5d01 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -54,18 +54,6 @@ void ensure_package_clientdata(struct pkginfo *pkg) {
   pkg->clientdata->files= 0;
 }
 
-const char *pkgadminfile(struct pkginfo *pkg, const char *whichfile) {
-  static struct varbuf vb;
-  varbufreset(&vb);
-  varbufaddstr(&vb,admindir);
-  varbufaddstr(&vb,"/" INFODIR);
-  varbufaddstr(&vb,pkg->name);
-  varbufaddc(&vb,'.');
-  varbufaddstr(&vb,whichfile);
-  varbufaddc(&vb,0);
-  return vb.buf;
-}
-
 int pkglistqsortcmp(const void *a, const void *b) {
   const struct pkginfo *pa= *(const struct pkginfo**)a;
   const struct pkginfo *pb= *(const struct pkginfo**)b;