The following commit has been merged in the master branch:
commit 5ec7516601fd68355ea162131a44c8bda315ad7b
Author: Raphaël Hertzog <[email protected]>
Date: Fri Jan 28 17:19:37 2011 +0100
Replace all pkg_db_iter_next() calls with pkg_db_iter_next_pkg()
Sponsored-by: Linaro Limited
Signed-off-by: Guillem Jover <[email protected]>
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index 8e5209f..b7fcd58 100644
--- a/dselect/pkglist.cc
+++ b/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 &&
diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index 338b89c..712c36c 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/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);
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c
index d452946..468bdcc 100644
--- a/lib/dpkg/dump.c
+++ b/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))
diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions
index b170bde..d38f455 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/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;
diff --git a/lib/dpkg/pkg-array.c b/lib/dpkg/pkg-array.c
index 30e99e0..c9f58b5 100644
--- a/lib/dpkg/pkg-array.c
+++ b/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);
diff --git a/lib/dpkg/pkg-db.c b/lib/dpkg/pkg-db.c
index 9d00369..6dc2dc9 100644
--- a/lib/dpkg/pkg-db.c
+++ b/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.
*
diff --git a/src/depcon.c b/src/depcon.c
index 863157c..477d47a 100644
--- a/src/depcon.c
+++ b/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;
}
diff --git a/src/enquiry.c b/src/enquiry.c
index 56de64d..9f2bcc8 100644
--- a/src/enquiry.c
+++ b/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;
diff --git a/src/help.c b/src/help.c
index c43dcc3..c9164aa 100644
--- a/src/help.c
+++ b/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;
diff --git a/src/packages.c b/src/packages.c
index 0531aa4..544a389 100644
--- a/src/packages.c
+++ b/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 ||
diff --git a/src/processarc.c b/src/processarc.c
index 802e9a2..e3e3ea0 100644
--- a/src/processarc.c
+++ b/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 ||
diff --git a/src/select.c b/src/select.c
index 770b946..49464cc 100644
--- a/src/select.c
+++ b/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;
}
diff --git a/src/trigproc.c b/src/trigproc.c
index c81a023..42195ef 100644
--- a/src/trigproc.c
+++ b/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",
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
