[Reproducible-commits] [dpkg] 33/63: libdpkg, dpkg: Rename iterators from ‘it’ to ‘iter’
Jérémy Bobbio
lunar at moszumanska.debian.org
Fri Mar 4 17:44:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch pu/buildinfo
in repository dpkg.
commit b2d2b8a433a8e947fd6a820b9fa77a6a250d0b02
Author: Guillem Jover <guillem at debian.org>
Date: Sun Jun 1 00:35:09 2014 +0200
libdpkg, dpkg: Rename iterators from ‘it’ to ‘iter’
---
lib/dpkg/dump.c | 8 ++++----
lib/dpkg/pkg-array.c | 8 ++++----
src/enquiry.c | 28 ++++++++++++++--------------
src/help.c | 8 ++++----
src/packages.c | 8 ++++----
src/remove.c | 12 ++++++------
src/select.c | 8 ++++----
src/trigproc.c | 16 ++++++++--------
src/unpack.c | 14 +++++++-------
src/verify.c | 8 ++++----
10 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c
index 2318295..b13eb6e 100644
--- a/lib/dpkg/dump.c
+++ b/lib/dpkg/dump.c
@@ -480,7 +480,7 @@ writedb(const char *filename, enum writedb_flags flags)
{
static char writebuf[8192];
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *pkg;
struct pkgbin *pkgbin;
const char *which;
@@ -494,8 +494,8 @@ writedb(const char *filename, enum writedb_flags flags)
if (setvbuf(file->fp, writebuf, _IOFBF, sizeof(writebuf)))
ohshite(_("unable to set buffering on %s database file"), which);
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it)) != NULL) {
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter)) != NULL) {
pkgbin = (flags & wdb_dump_available) ? &pkg->available : &pkg->installed;
/* Don't dump records which have no useful content. */
if (!pkg_is_informative(pkg, pkgbin))
@@ -508,7 +508,7 @@ writedb(const char *filename, enum writedb_flags flags)
which, pkgbin_name(pkg, pkgbin, pnaw_nonambig), filename);
varbuf_reset(&vb);
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
varbuf_destroy(&vb);
if (flags & wdb_must_sync)
atomic_file_sync(file);
diff --git a/lib/dpkg/pkg-array.c b/lib/dpkg/pkg-array.c
index 767fe0d..24c6dc0 100644
--- a/lib/dpkg/pkg-array.c
+++ b/lib/dpkg/pkg-array.c
@@ -62,17 +62,17 @@ pkg_array_init_from_names(struct pkg_array *a, pkg_mapper_func pkg_mapper,
void
pkg_array_init_from_db(struct pkg_array *a)
{
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *pkg;
int i;
a->n_pkgs = pkg_db_count_pkg();
a->pkgs = m_malloc(sizeof(a->pkgs[0]) * a->n_pkgs);
- it = pkg_db_iter_new();
- for (i = 0; (pkg = pkg_db_iter_next_pkg(it)); i++)
+ iter = pkg_db_iter_new();
+ for (i = 0; (pkg = pkg_db_iter_next_pkg(iter)); i++)
a->pkgs[i] = pkg;
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
assert(i == a->n_pkgs);
}
diff --git a/src/enquiry.c b/src/enquiry.c
index 416194f..9f71863 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -273,7 +273,7 @@ unpackchk(const char *const *argv)
{
int totalcount, sects;
struct sectionentry *sectionentries, *se, **sep;
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *pkg;
const char *thissect;
char buf[20];
@@ -287,8 +287,8 @@ unpackchk(const char *const *argv)
totalcount= 0;
sectionentries = NULL;
sects= 0;
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it))) {
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter))) {
if (!yettobeunpacked(pkg, &thissect)) continue;
for (se= sectionentries; se && strcasecmp(thissect,se->name); se= se->next);
if (!se) {
@@ -304,27 +304,27 @@ unpackchk(const char *const *argv)
}
se->count++; totalcount++;
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
if (totalcount == 0)
return 0;
if (totalcount <= 12) {
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it))) {
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter))) {
if (!yettobeunpacked(pkg, NULL))
continue;
describebriefly(pkg);
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
} else if (sects <= 12) {
for (se= sectionentries; se; se= se->next) {
sprintf(buf,"%d",se->count);
printf(_(" %d in %s: "),se->count,se->name);
width= 70-strlen(se->name)-strlen(buf);
while (width > 59) { putchar(' '); width--; }
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it))) {
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter))) {
const char *pkgname;
if (!yettobeunpacked(pkg,&thissect)) continue;
@@ -335,7 +335,7 @@ unpackchk(const char *const *argv)
if (width < 4) { printf(" ..."); break; }
printf(" %s", pkgname);
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
putchar('\n');
}
} else {
@@ -458,7 +458,7 @@ predeppackage(const char *const *argv)
{
static struct varbuf vb;
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *pkg = NULL, *startpkg, *trypkg;
struct dependency *dep;
struct deppossi *possi, *provider;
@@ -471,8 +471,8 @@ predeppackage(const char *const *argv)
clear_istobes();
dep = NULL;
- it = pkg_db_iter_new();
- while (!dep && (pkg = pkg_db_iter_next_pkg(it))) {
+ iter = pkg_db_iter_new();
+ while (!dep && (pkg = pkg_db_iter_next_pkg(iter))) {
/* Ignore packages user doesn't want. */
if (pkg->want != PKG_WANT_INSTALL)
continue;
@@ -490,7 +490,7 @@ predeppackage(const char *const *argv)
pkg->clientdata->istobe = PKG_ISTOBE_NORMAL;
/* If dep is NULL we go and get the next package. */
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
if (!dep)
return 1; /* Not found. */
diff --git a/src/help.c b/src/help.c
index 09a31ed..670985b 100644
--- a/src/help.c
+++ b/src/help.c
@@ -196,16 +196,16 @@ force_conflicts(struct deppossi *possi)
}
void clear_istobes(void) {
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *pkg;
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it)) != NULL) {
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter)) != NULL) {
ensure_package_clientdata(pkg);
pkg->clientdata->istobe = PKG_ISTOBE_NORMAL;
pkg->clientdata->replacingfilesandsaid= 0;
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
}
/*
diff --git a/src/packages.c b/src/packages.c
index 32a70ae..f68c971 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -72,11 +72,11 @@ enqueue_package_mark_seen(struct pkginfo *pkg)
static void
enqueue_pending(void)
{
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *pkg;
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it)) != NULL) {
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter)) != NULL) {
switch (cipaction->arg_int) {
case act_configure:
if (!(pkg->status == PKG_STAT_UNPACKED ||
@@ -108,7 +108,7 @@ enqueue_pending(void)
}
enqueue_package(pkg);
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
}
static void
diff --git a/src/remove.c b/src/remove.c
index bab6180..b5cb996 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -247,7 +247,7 @@ removal_bulk_file_is_shared(struct pkginfo *pkg, struct filenamenode *namenode)
static void
removal_bulk_remove_files(struct pkginfo *pkg)
{
- struct reversefilelistiter rlistit;
+ struct reversefilelistiter rev_iter;
struct fileinlist *leftover;
struct filenamenode *namenode;
static struct varbuf fnvb;
@@ -258,9 +258,9 @@ removal_bulk_remove_files(struct pkginfo *pkg)
modstatdb_note(pkg);
push_checkpoint(~ehflag_bombout, ehflag_normaltidy);
- reversefilelist_init(&rlistit,pkg->clientdata->files);
+ reversefilelist_init(&rev_iter, pkg->clientdata->files);
leftover = NULL;
- while ((namenode= reversefilelist_next(&rlistit))) {
+ while ((namenode = reversefilelist_next(&rev_iter))) {
struct filenamenode *usenode;
bool is_dir;
@@ -369,7 +369,7 @@ removal_bulk_remove_files(struct pkginfo *pkg)
}
static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) {
- struct reversefilelistiter rlistit;
+ struct reversefilelistiter rev_iter;
struct fileinlist *leftover;
struct filenamenode *namenode;
static struct varbuf fnvb;
@@ -381,9 +381,9 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) {
modstatdb_note(pkg);
push_checkpoint(~ehflag_bombout, ehflag_normaltidy);
- reversefilelist_init(&rlistit,pkg->clientdata->files);
+ reversefilelist_init(&rev_iter, pkg->clientdata->files);
leftover = NULL;
- while ((namenode= reversefilelist_next(&rlistit))) {
+ while ((namenode = reversefilelist_next(&rev_iter))) {
struct filenamenode *usenode;
debug(dbg_eachfile, "removal_bulk '%s' flags=%o",
diff --git a/src/select.c b/src/select.c
index 7552096..1f0d4df 100644
--- a/src/select.c
+++ b/src/select.c
@@ -208,7 +208,7 @@ int
clearselections(const char *const *argv)
{
enum modstatdb_rw msdbflags;
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *pkg;
if (*argv)
@@ -222,12 +222,12 @@ clearselections(const char *const *argv)
modstatdb_open(msdbflags);
pkg_infodb_upgrade();
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it))) {
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter))) {
if (!pkg->installed.essential)
pkg_set_want(pkg, PKG_WANT_DEINSTALL);
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
modstatdb_shutdown();
diff --git a/src/trigproc.c b/src/trigproc.c
index 9026dfc..d442e60 100644
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -257,7 +257,7 @@ check_trigger_cycle(struct pkginfo *processing_now)
struct trigcyclenode *tcn;
struct trigcycleperpkg *tcpp, *tortoise_pkg;
struct trigpend *tortoise_trig;
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *pkg, *giveup;
const char *sep;
@@ -268,8 +268,8 @@ check_trigger_cycle(struct pkginfo *processing_now)
tcn->pkgs = NULL;
tcn->then_processed = processing_now;
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it))) {
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter))) {
if (!pkg->trigpend_head)
continue;
tcpp = nfmalloc(sizeof(*tcpp));
@@ -278,7 +278,7 @@ check_trigger_cycle(struct pkginfo *processing_now)
tcpp->next = tcn->pkgs;
tcn->pkgs = tcpp;
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
if (!hare) {
debug(dbg_triggersdetail, "check_triggers_cycle pnow=%s first",
pkg_name(processing_now, pnaw_always));
@@ -488,11 +488,11 @@ transitional_interest_callback(const char *trig, struct pkginfo *pkg,
static void
trig_transitional_activate(enum modstatdb_rw cstatus)
{
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *pkg;
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it))) {
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter))) {
if (pkg->status <= PKG_STAT_HALFINSTALLED)
continue;
debug(dbg_triggersdetail, "trig_transitional_activate %s %s",
@@ -519,7 +519,7 @@ trig_transitional_activate(enum modstatdb_rw cstatus)
else
pkg_set_status(pkg, PKG_STAT_INSTALLED);
}
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
if (cstatus >= msdbrw_write) {
modstatdb_checkpoint();
diff --git a/src/unpack.c b/src/unpack.c
index 55ab7f8..31ec7d2 100644
--- a/src/unpack.c
+++ b/src/unpack.c
@@ -438,13 +438,13 @@ pkg_remove_old_files(struct pkginfo *pkg,
struct filenamenode_queue *newfiles_queue,
struct filenamenode_queue *newconffiles)
{
- struct reversefilelistiter rlistit;
+ struct reversefilelistiter rev_iter;
struct filenamenode *namenode;
struct stat stab, oldfs;
- reversefilelist_init(&rlistit, pkg->clientdata->files);
+ reversefilelist_init(&rev_iter, pkg->clientdata->files);
- while ((namenode = reversefilelist_next(&rlistit))) {
+ while ((namenode = reversefilelist_next(&rev_iter))) {
struct filenamenode *usenode;
if ((namenode->flags & fnnf_new_conff) ||
@@ -711,15 +711,15 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour)
static void
pkg_disappear_others(struct pkginfo *pkg)
{
- struct pkgiterator *it;
+ struct pkgiterator *iter;
struct pkginfo *otherpkg;
struct fileinlist *cfile;
struct deppossi *pdep;
struct dependency *providecheck;
struct varbuf depprobwhy = VARBUF_INIT;
- it = pkg_db_iter_new();
- while ((otherpkg = pkg_db_iter_next_pkg(it)) != NULL) {
+ iter = pkg_db_iter_new();
+ while ((otherpkg = pkg_db_iter_next_pkg(iter)) != NULL) {
ensure_package_clientdata(otherpkg);
if (otherpkg == pkg ||
@@ -810,7 +810,7 @@ pkg_disappear_others(struct pkginfo *pkg)
* what can we do ? It has to be run this late. */
pkg_disappear(otherpkg, pkg);
} /* while (otherpkg= ... */
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
}
/**
diff --git a/src/verify.c b/src/verify.c
index 34e5379..e68ec7b 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -147,12 +147,12 @@ verify(const char *const *argv)
ensure_diversions();
if (!*argv) {
- struct pkgiterator *it;
+ struct pkgiterator *iter;
- it = pkg_db_iter_new();
- while ((pkg = pkg_db_iter_next_pkg(it)))
+ iter = pkg_db_iter_new();
+ while ((pkg = pkg_db_iter_next_pkg(iter)))
verify_package(pkg);
- pkg_db_iter_free(it);
+ pkg_db_iter_free(iter);
} else {
const char *thisarg;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list