Move duplicate ensure_package_clientdata functions to src/filesdb.c

diff --git a/ChangeLog b/ChangeLog
index a5b707d3c21a4a281370724cec2b6f83c16d9d96..c5ab8e7419fedf6b2f810ea0df160a4915cbf48a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-25  Guillem Jover  <guillem@debian.org>
+
+       * src/main.h (ensure_package_clientdata): Move prototype to ...
+       * src/filesdb.h: ... here.
+       * src/help.c (ensure_package_clientdata): Move function to ...
+       * src/filesdb.c: ... here.
+       * src/query.c: Remove duplicate function.
+
 2008-03-25  Guillem Jover  <guillem@debian.org>
 
        * lib/dpkg-db.h (unlockdatabase): Change prototype to not take any

diff --git a/src/filesdb.c b/src/filesdb.c
index bc5973ba8011c847aca4bbde4f2fd10fe3c5f82e..46b3cbff160e1a73af0972e9b1f6d5ac8d35cd96 100644 (file)
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -46,6 +46,17 @@ static struct diversion *diversions = NULL;
 static FILE *diversionsfile = NULL;
 static FILE *statoverridefile = NULL;
 
+void
+ensure_package_clientdata(struct pkginfo *pkg)
+{
+  if (pkg->clientdata)
+    return;
+  pkg->clientdata = nfmalloc(sizeof(struct perpackagestate));
+  pkg->clientdata->istobe = itb_normal;
+  pkg->clientdata->fileslistvalid = 0;
+  pkg->clientdata->files = NULL;
+}
+
 void note_must_reread_files_inpackage(struct pkginfo *pkg) {
   allpackagesdone= 0;
   ensure_package_clientdata(pkg);

diff --git a/src/filesdb.h b/src/filesdb.h
index 912dea12dd038398a88d2014cf3d353f2147216f..c4ed84773dfbc7b26f46ec870e315101a44525a1 100644 (file)
--- a/src/filesdb.h
+++ b/src/filesdb.h
@@ -131,6 +131,8 @@ struct fileiterator *iterfilestart(void);
 struct filenamenode *iterfilenext(struct fileiterator *i);
 void iterfileend(struct fileiterator *i);
 
+void ensure_package_clientdata(struct pkginfo *pkg);
+
 void ensure_diversions(void);
 void ensure_statoverrides(void);
 

diff --git a/src/help.c b/src/help.c
index 6bb9f2a4302193ea855784ce30778cd0bc018339..2396d39b7796984abdebf0cca9b4ed7c65cb4c2e 100644 (file)
--- a/src/help.c
+++ b/src/help.c
@@ -113,14 +113,6 @@ void checkpath(void) {
                 warned);
 }
 
-void ensure_package_clientdata(struct pkginfo *pkg) {
-  if (pkg->clientdata) return;
-  pkg->clientdata= nfmalloc(sizeof(struct perpackagestate));
-  pkg->clientdata->istobe= itb_normal;
-  pkg->clientdata->fileslistvalid= 0;
-  pkg->clientdata->files = NULL;
-}
-
 int ignore_depends(struct pkginfo *pkg) {
   struct packageinlist *id;
   for (id= ignoredependss; id; id= id->next)

diff --git a/src/main.h b/src/main.h
index a490e8d428a6f14179f7ea7a7bb465465e13c03a..101ce2e4e22e571c1d8c60965f02f9acdf547fa1 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -181,7 +181,6 @@ int force_depends(struct deppossi *possi);
 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);
 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 ae5f0cad4d9648de98d8ba863012ed72f960c60c..631ee58ce4fc184cf4cbb06b9ba38c8251c660ee 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -46,14 +46,6 @@
 static const char* showformat          = "${Package}\t${Version}\n";
 
 
-void ensure_package_clientdata(struct pkginfo *pkg) {
-  if (pkg->clientdata) return;
-  pkg->clientdata= nfmalloc(sizeof(struct perpackagestate));
-  pkg->clientdata->istobe= itb_normal;
-  pkg->clientdata->fileslistvalid= 0;
-  pkg->clientdata->files= 0;
-}
-
 int pkglistqsortcmp(const void *a, const void *b) {
   const struct pkginfo *pa= *(const struct pkginfo**)a;
   const struct pkginfo *pb= *(const struct pkginfo**)b;