Replace all pkg_db_iter_next() calls with pkg_db_iter_next_pkg()

Sponsored-by: Linaro Limited

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

dselect/pkglist.cc

@@ -386,7 +386,7 @@ packagelist::packagelist(keybindings *kb) : baselist(kb) {
   nitems = 0;
 
   iter = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next(iter))) {
+  while ((pkg = pkg_db_iter_next_pkg(iter))) {
     struct perpackagestate *state= &datatable[nitems];
     state->pkg= pkg;
     if (pkg->status == pkginfo::stat_notinstalled &&

lib/dpkg/dpkg-db.h

@@ -274,7 +274,6 @@ int pkg_db_count_pkg(void);
 void pkg_db_reset(void);
 
 struct pkgiterator *pkg_db_iter_new(void);
-struct pkginfo *pkg_db_iter_next(struct pkgiterator *iter);
 struct pkgset *pkg_db_iter_next_set(struct pkgiterator *iter);
 struct pkginfo *pkg_db_iter_next_pkg(struct pkgiterator *iter);
 void pkg_db_iter_free(struct pkgiterator *iter);

lib/dpkg/dump.c

@@ -470,7 +470,7 @@ writedb(const char *filename, enum writedb_flags flags)
     ohshite(_("unable to set buffering on %s database file"), which);
 
   it = pkg_db_iter_new();
-  while ((pigp = pkg_db_iter_next(it)) != NULL) {
+  while ((pigp = pkg_db_iter_next_pkg(it)) != NULL) {
     pifp = (flags & wdb_dump_available) ? &pigp->available : &pigp->installed;
     /* Don't dump records which have no useful content. */
     if (!pkg_is_informative(pigp, pifp))

lib/dpkg/libdpkg.Versions

@@ -225,7 +225,6 @@ LIBDPKG_PRIVATE {
 	pkg_db_count_pkg;
 	pkg_db_reset;
 	pkg_db_iter_new;
-	pkg_db_iter_next;
 	pkg_db_iter_next_set;
 	pkg_db_iter_next_pkg;
 	pkg_db_iter_free;

lib/dpkg/pkg-array.c

@@ -46,7 +46,7 @@ pkg_array_init_from_db(struct pkg_array *a)
 	a->pkgs = m_malloc(sizeof(a->pkgs[0]) * a->n_pkgs);
 
 	it = pkg_db_iter_new();
-	for (i = 0; (pkg = pkg_db_iter_next(it)); i++)
+	for (i = 0; (pkg = pkg_db_iter_next_pkg(it)); i++)
 		a->pkgs[i] = pkg;
 	pkg_db_iter_free(it);
 

lib/dpkg/pkg-db.c

@@ -241,12 +241,6 @@ pkg_db_iter_next_pkg(struct pkgiterator *i)
   return r;
 }
 
-struct pkginfo *
-pkg_db_iter_next(struct pkgiterator *iter)
-{
-  return pkg_db_iter_next_pkg(iter);
-}
-
 /**
  * Free the package database iterator.
  *

src/depcon.c

@@ -157,7 +157,7 @@ findbreakcycle(struct pkginfo *pkg)
 
   /* Clear the visited flag of all packages before we traverse them. */
   iter = pkg_db_iter_new();
-  while ((tpkg = pkg_db_iter_next(iter))) {
+  while ((tpkg = pkg_db_iter_next_pkg(iter))) {
     ensure_package_clientdata(tpkg);
     tpkg->clientdata->color = white;
   }

src/enquiry.c

@@ -145,7 +145,7 @@ audit(const char *const *argv)
     bool head = false;
 
     it = pkg_db_iter_new();
-    while ((pkg = pkg_db_iter_next(it))) {
+    while ((pkg = pkg_db_iter_next_pkg(it))) {
       if (!bsi->yesno(pkg,bsi)) continue;
       if (!head_running) {
         if (modstatdb_is_locked())
@@ -217,7 +217,7 @@ unpackchk(const char *const *argv)
   sectionentries = NULL;
   sects= 0;
   it = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next(it))) {
+  while ((pkg = pkg_db_iter_next_pkg(it))) {
     if (!yettobeunpacked(pkg, &thissect)) continue;
     for (se= sectionentries; se && strcasecmp(thissect,se->name); se= se->next);
     if (!se) {
@@ -240,7 +240,7 @@ unpackchk(const char *const *argv)
 
   if (totalcount <= 12) {
     it = pkg_db_iter_new();
-    while ((pkg = pkg_db_iter_next(it))) {
+    while ((pkg = pkg_db_iter_next_pkg(it))) {
       if (!yettobeunpacked(pkg, NULL))
         continue;
       describebriefly(pkg);
@@ -253,7 +253,7 @@ unpackchk(const char *const *argv)
       width= 70-strlen(se->name)-strlen(buf);
       while (width > 59) { putchar(' '); width--; }
       it = pkg_db_iter_new();
-      while ((pkg = pkg_db_iter_next(it))) {
+      while ((pkg = pkg_db_iter_next_pkg(it))) {
         if (!yettobeunpacked(pkg,&thissect)) continue;
         if (strcasecmp(thissect,se->name)) continue;
         width -= strlen(pkg->set->name);
@@ -380,7 +380,7 @@ predeppackage(const char *const *argv)
 
   dep = NULL;
   it = pkg_db_iter_new();
-  while (!dep && (pkg = pkg_db_iter_next(it))) {
+  while (!dep && (pkg = pkg_db_iter_next_pkg(it))) {
     /* Ignore packages user doesn't want. */
     if (pkg->want != want_install)
       continue;

src/help.c

@@ -455,7 +455,7 @@ void clear_istobes(void) {
   struct pkginfo *pkg;
 
   it = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next(it)) != NULL) {
+  while ((pkg = pkg_db_iter_next_pkg(it)) != NULL) {
     ensure_package_clientdata(pkg);
     pkg->clientdata->istobe= itb_normal;
     pkg->clientdata->replacingfilesandsaid= 0;

src/packages.c

@@ -63,7 +63,7 @@ enqueue_pending(void)
   struct pkginfo *pkg;
 
   it = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next(it)) != NULL) {
+  while ((pkg = pkg_db_iter_next_pkg(it)) != NULL) {
     switch (cipaction->arg_int) {
     case act_configure:
       if (!(pkg->status == stat_unpacked ||

src/processarc.c

@@ -1152,7 +1152,7 @@ void process_archive(const char *filename) {
    * Conffiles are ignored (the new package had better do something
    * with them!). */
   it = pkg_db_iter_new();
-  while ((otherpkg = pkg_db_iter_next(it)) != NULL) {
+  while ((otherpkg = pkg_db_iter_next_pkg(it)) != NULL) {
     ensure_package_clientdata(otherpkg);
     if (otherpkg == pkg ||
         otherpkg->status == stat_notinstalled ||

src/select.c

@@ -172,7 +172,7 @@ clearselections(const char *const *argv)
   modstatdb_open(msdbrw_write);
 
   it = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next(it))) {
+  while ((pkg = pkg_db_iter_next_pkg(it))) {
     if (!pkg->installed.essential)
       pkg->want = want_deinstall;
   }

src/trigproc.c

@@ -184,7 +184,7 @@ check_trigger_cycle(struct pkginfo *processing_now)
 	tcn->then_processed = processing_now;
 
 	it = pkg_db_iter_new();
-	while ((pkg = pkg_db_iter_next(it))) {
+	while ((pkg = pkg_db_iter_next_pkg(it))) {
 		if (!pkg->trigpend_head)
 			continue;
 		tcpp = nfmalloc(sizeof(*tcpp));
@@ -384,7 +384,7 @@ trig_transitional_activate(enum modstatdb_rw cstatus)
 	struct pkginfo *pkg;
 
 	it = pkg_db_iter_new();
-	while ((pkg = pkg_db_iter_next(it))) {
+	while ((pkg = pkg_db_iter_next_pkg(it))) {
 		if (pkg->status <= stat_halfinstalled)
 			continue;
 		debug(dbg_triggersdetail, "trig_transitional_activate %s %s",