Replace all pkg_db_count() calls with pkg_db_count_pkg()

Sponsored-by: Linaro Limited

Signed-off-by: Guillem Jover <guillem@debian.org>

dselect/pkglist.cc

@@ -355,7 +355,7 @@ void packagelist::sortmakeheads() {
 void packagelist::initialsetup() {
   debug(dbg_general, "packagelist[%p]::initialsetup()", this);
 
-  int allpackages = pkg_db_count();
+  int allpackages = pkg_db_count_pkg();
   datatable= new struct perpackagestate[allpackages];
 
   nallocated= allpackages+150; // will realloc if necessary, so 150 not critical

lib/dpkg/dpkg-db.h

@@ -269,7 +269,6 @@ bool pkg_is_informative(struct pkginfo *pkg, struct pkgbin *info);
 struct pkginfo *pkg_db_find(const char *name);
 struct pkgset *pkg_db_find_set(const char *name);
 struct pkginfo *pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch);
-int pkg_db_count(void);
 int pkg_db_count_set(void);
 int pkg_db_count_pkg(void);
 void pkg_db_reset(void);

lib/dpkg/libdpkg.Versions

@@ -221,7 +221,6 @@ LIBDPKG_PRIVATE {
 	pkg_db_find;
 	pkg_db_find_set;
 	pkg_db_find_pkg;
-	pkg_db_count;
 	pkg_db_count_set;
 	pkg_db_count_pkg;
 	pkg_db_reset;

lib/dpkg/pkg-array.c

@@ -42,7 +42,7 @@ pkg_array_init_from_db(struct pkg_array *a)
 	struct pkginfo *pkg;
 	int i;
 
-	a->n_pkgs = pkg_db_count();
+	a->n_pkgs = pkg_db_count_pkg();
 	a->pkgs = m_malloc(sizeof(a->pkgs[0]) * a->n_pkgs);
 
 	it = pkg_db_iter_new();

lib/dpkg/pkg-db.c

@@ -152,12 +152,6 @@ pkg_db_count_pkg(void)
   return npkg;
 }
 
-int
-pkg_db_count(void)
-{
-  return nset;
-}
-
 struct pkgiterator {
   struct pkginfo *pigp;
   int nbinn;

src/filesdb.c

@@ -461,7 +461,7 @@ void ensure_allinstfiles_available(void) {
 
   if (allpackagesdone) return;
   if (saidread<2) {
-    int max = pkg_db_count();
+    int max = pkg_db_count_pkg();
 
     saidread=1;
     progress_init(&progress, _("(Reading database ... "), max);