This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch master
in repository dpkg.

commit 64fca5b2fc9b12d5971453d62bef439132b78d42
Author: Guillem Jover <[email protected]>
Date:   Sun Apr 1 22:16:53 2018 +0200

    dpkg: Add new fsys_hash_entries() function to abstract nfiles access
    
    This will be needed when moving the fsys hash implementation into
    libdpkg.
---
 src/filesdb.c | 11 +++++++++--
 src/filesdb.h |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/filesdb.c b/src/filesdb.c
index 7f15772..6e99c36 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 954d67b..6a7c6af 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/dpkg/dpkg.git

Reply via email to