summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2018-04-01 22:16:53 +0200
committerGuillem Jover <guillem@debian.org>2018-05-03 02:14:14 +0200
commit64fca5b2fc9b12d5971453d62bef439132b78d42 (patch)
treebb784eae4ddc5977ff75a42796cb7a4ac751889f
parent2c765a394f539a6e0e9c60b78a07b9c215ef644a (diff)
downloaddpkg-64fca5b2fc9b12d5971453d62bef439132b78d42.tar.gz
dpkg: Add new fsys_hash_entries() function to abstract nfiles access
This will be needed when moving the fsys hash implementation into libdpkg.
-rw-r--r--src/filesdb.c11
-rw-r--r--src/filesdb.h1
2 files changed, 10 insertions, 2 deletions
diff --git a/src/filesdb.c b/src/filesdb.c
index 7f157727d..6e99c36f3 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -428,8 +428,9 @@ void ensure_allinstfiles_available(void) {
if (saidread == PKG_FILESDB_LOAD_INPROGRESS) {
progress_done(&progress);
printf(P_("%d file or directory currently installed.)\n",
- "%d files and directories currently installed.)\n", nfiles),
- nfiles);
+ "%d files and directories currently installed.)\n",
+ fsys_hash_entries()),
+ fsys_hash_entries());
saidread = PKG_FILESDB_LOAD_DONE;
}
}
@@ -589,6 +590,12 @@ files_db_reset(void)
bins[i] = NULL;
}
+int
+fsys_hash_entries(void)
+{
+ return nfiles;
+}
+
struct filenamenode *findnamenode(const char *name, enum fnnflags flags) {
struct filenamenode **pointerp, *newnode;
const char *orig_name = name;
diff --git a/src/filesdb.h b/src/filesdb.h
index 954d67bd8..6a7c6afee 100644
--- a/src/filesdb.h
+++ b/src/filesdb.h
@@ -153,6 +153,7 @@ void filepackages_iter_free(struct filepackages_iterator *iter);
void filesdbinit(void);
void files_db_reset(void);
+int fsys_hash_entries(void);
struct fileiterator;
struct fileiterator *files_db_iter_new(void);