The following commit has been merged in the master branch:
commit 067ac6ba868ef2fd37155009a49eb7e5bf6995dd
Author: Guillem Jover <guil...@debian.org>
Date: Sat Mar 31 23:25:48 2012 +0200
Rename pigp variables to pkg
diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index 80a00fe..553ba24 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/lib/dpkg/dpkg-db.h
@@ -162,8 +162,6 @@ struct perpackagestate;
* Node describing an architecture package instance.
*
* This structure holds state information.
- *
- * Note: Usually referred in the code as pig.
*/
struct pkginfo {
struct pkgset *set;
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c
index 68a8287..58444b9 100644
--- a/lib/dpkg/dump.c
+++ b/lib/dpkg/dump.c
@@ -47,20 +47,20 @@
void
w_name(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
- assert(pigp->set->name);
+ assert(pkg->set->name);
if (flags&fw_printheader)
varbuf_add_str(vb, "Package: ");
- varbuf_add_str(vb, pigp->set->name);
+ varbuf_add_str(vb, pkg->set->name);
if (flags&fw_printheader)
varbuf_add_char(vb, '\n');
}
void
w_version(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
if (!dpkg_version_is_informative(&pifp->version))
@@ -74,36 +74,37 @@ w_version(struct varbuf *vb,
void
w_configversion(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
- if (pifp != &pigp->installed) return;
- if (!dpkg_version_is_informative(&pigp->configversion))
+ if (pifp != &pkg->installed)
return;
- if (pigp->status == stat_installed ||
- pigp->status == stat_notinstalled ||
- pigp->status == stat_triggerspending)
+ if (!dpkg_version_is_informative(&pkg->configversion))
+ return;
+ if (pkg->status == stat_installed ||
+ pkg->status == stat_notinstalled ||
+ pkg->status == stat_triggerspending)
return;
if (flags&fw_printheader)
varbuf_add_str(vb, "Config-Version: ");
- varbufversion(vb,&pigp->configversion,vdew_nonambig);
+ varbufversion(vb, &pkg->configversion, vdew_nonambig);
if (flags&fw_printheader)
varbuf_add_char(vb, '\n');
}
void
w_null(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
}
void
w_section(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
- const char *value= pigp->section;
+ const char *value = pkg->section;
if (!value || !*value) return;
if (flags&fw_printheader)
varbuf_add_str(vb, "Section: ");
@@ -114,7 +115,7 @@ w_section(struct varbuf *vb,
void
w_charfield(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
const char *value = PKGPFIELD(pifp, fip->integer, const char *);
@@ -130,13 +131,14 @@ w_charfield(struct varbuf *vb,
void
w_filecharf(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
struct filedetails *fdp;
- if (pifp != &pigp->available) return;
- fdp= pigp->files;
+ if (pifp != &pkg->available)
+ return;
+ fdp = pkg->files;
if (!fdp || !FILEFFIELD(fdp,fip->integer,const char*)) return;
if (flags&fw_printheader) {
@@ -156,7 +158,7 @@ w_filecharf(struct varbuf *vb,
void
w_booleandefno(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
bool value = PKGPFIELD(pifp, fip->integer, bool);
@@ -172,7 +174,7 @@ w_booleandefno(struct varbuf *vb,
void
w_multiarch(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
int value = PKGPFIELD(pifp, fip->integer, int);
@@ -192,7 +194,7 @@ w_multiarch(struct varbuf *vb,
void
w_architecture(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
if (!pifp->arch)
@@ -213,32 +215,34 @@ w_architecture(struct varbuf *vb,
void
w_priority(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
- if (pigp->priority == pri_unknown) return;
- assert(pigp->priority <= pri_unknown);
+ if (pkg->priority == pri_unknown)
+ return;
+ assert(pkg->priority <= pri_unknown);
if (flags&fw_printheader)
varbuf_add_str(vb, "Priority: ");
- varbuf_add_str(vb, pigp->priority == pri_other ?
- pigp->otherpriority :
- priorityinfos[pigp->priority].name);
+ varbuf_add_str(vb, pkg->priority == pri_other ?
+ pkg->otherpriority :
+ priorityinfos[pkg->priority].name);
if (flags&fw_printheader)
varbuf_add_char(vb, '\n');
}
void
w_status(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
- if (pifp != &pigp->installed) return;
- assert(pigp->want <= want_purge);
- assert(pigp->eflag <= eflag_reinstreq);
+ if (pifp != &pkg->installed)
+ return;
+ assert(pkg->want <= want_purge);
+ assert(pkg->eflag <= eflag_reinstreq);
-#define PEND pigp->trigpend_head
-#define AW pigp->trigaw.head
- switch (pigp->status) {
+#define PEND pkg->trigpend_head
+#define AW pkg->trigaw.head
+ switch (pkg->status) {
case stat_notinstalled:
case stat_configfiles:
assert(!PEND);
@@ -261,18 +265,18 @@ w_status(struct varbuf *vb,
assert(!AW);
break;
default:
- internerr("unknown package status '%d'", pigp->status);
+ internerr("unknown package status '%d'", pkg->status);
}
#undef PEND
#undef AW
if (flags&fw_printheader)
varbuf_add_str(vb, "Status: ");
- varbuf_add_str(vb, wantinfos[pigp->want].name);
+ varbuf_add_str(vb, wantinfos[pkg->want].name);
varbuf_add_char(vb, ' ');
- varbuf_add_str(vb, eflaginfos[pigp->eflag].name);
+ varbuf_add_str(vb, eflaginfos[pkg->eflag].name);
varbuf_add_char(vb, ' ');
- varbuf_add_str(vb, statusinfos[pigp->status].name);
+ varbuf_add_str(vb, statusinfos[pkg->status].name);
if (flags&fw_printheader)
varbuf_add_char(vb, '\n');
}
@@ -319,7 +323,7 @@ void varbufdependency(struct varbuf *vb, struct dependency
*dep) {
void
w_dependency(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
char fnbuf[50];
@@ -334,7 +338,7 @@ w_dependency(struct varbuf *vb,
depdel= fnbuf;
for (dyp= pifp->depends; dyp; dyp= dyp->next) {
if (dyp->type != fip->integer) continue;
- assert(dyp->up == pigp);
+ assert(dyp->up == pkg);
varbuf_add_str(vb, depdel);
depdel = ", ";
varbufdependency(vb,dyp);
@@ -345,12 +349,12 @@ w_dependency(struct varbuf *vb,
void
w_conffiles(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
struct conffile *i;
- if (!pifp->conffiles || pifp == &pigp->available)
+ if (!pifp->conffiles || pifp == &pkg->available)
return;
if (flags&fw_printheader)
varbuf_add_str(vb, "Conffiles:\n");
@@ -370,20 +374,20 @@ w_conffiles(struct varbuf *vb,
void
w_trigpend(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
struct trigpend *tp;
- if (pifp == &pigp->available || !pigp->trigpend_head)
+ if (pifp == &pkg->available || !pkg->trigpend_head)
return;
- assert(pigp->status >= stat_triggersawaited &&
- pigp->status <= stat_triggerspending);
+ assert(pkg->status >= stat_triggersawaited &&
+ pkg->status <= stat_triggerspending);
if (flags & fw_printheader)
varbuf_add_str(vb, "Triggers-Pending:");
- for (tp = pigp->trigpend_head; tp; tp = tp->next) {
+ for (tp = pkg->trigpend_head; tp; tp = tp->next) {
varbuf_add_char(vb, ' ');
varbuf_add_str(vb, tp->name);
}
@@ -393,20 +397,20 @@ w_trigpend(struct varbuf *vb,
void
w_trigaw(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp,
+ const struct pkginfo *pkg, const struct pkgbin *pifp,
enum fwriteflags flags, const struct fieldinfo *fip)
{
struct trigaw *ta;
- if (pifp == &pigp->available || !pigp->trigaw.head)
+ if (pifp == &pkg->available || !pkg->trigaw.head)
return;
- assert(pigp->status > stat_configfiles &&
- pigp->status <= stat_triggersawaited);
+ assert(pkg->status > stat_configfiles &&
+ pkg->status <= stat_triggersawaited);
if (flags & fw_printheader)
varbuf_add_str(vb, "Triggers-Awaited:");
- for (ta = pigp->trigaw.head; ta; ta = ta->sameaw.next) {
+ for (ta = pkg->trigaw.head; ta; ta = ta->sameaw.next) {
varbuf_add_char(vb, ' ');
varbuf_add_pkgbin_name(vb, ta->pend, &ta->pend->installed, pnaw_nonambig);
}
@@ -416,13 +420,13 @@ w_trigaw(struct varbuf *vb,
void
varbufrecord(struct varbuf *vb,
- const struct pkginfo *pigp, const struct pkgbin *pifp)
+ const struct pkginfo *pkg, const struct pkgbin *pifp)
{
const struct fieldinfo *fip;
const struct arbitraryfield *afp;
for (fip= fieldinfos; fip->name; fip++) {
- fip->wcall(vb,pigp,pifp,fw_printheader,fip);
+ fip->wcall(vb, pkg, pifp, fw_printheader, fip);
}
for (afp = pifp->arbs; afp; afp = afp->next) {
varbuf_add_str(vb, afp->name);
@@ -434,17 +438,17 @@ varbufrecord(struct varbuf *vb,
void
writerecord(FILE *file, const char *filename,
- const struct pkginfo *pigp, const struct pkgbin *pifp)
+ const struct pkginfo *pkg, const struct pkgbin *pifp)
{
struct varbuf vb = VARBUF_INIT;
- varbufrecord(&vb,pigp,pifp);
+ varbufrecord(&vb, pkg, pifp);
varbuf_end_str(&vb);
if (fputs(vb.buf,file) < 0) {
struct varbuf pkgname = VARBUF_INIT;
int errno_saved = errno;
- varbuf_add_pkgbin_name(&pkgname, pigp, pifp, pnaw_nonambig);
+ varbuf_add_pkgbin_name(&pkgname, pkg, pifp, pnaw_nonambig);
errno = errno_saved;
ohshite(_("failed to write details of `%.50s' to `%.250s'"),
@@ -460,7 +464,7 @@ writedb(const char *filename, enum writedb_flags flags)
static char writebuf[8192];
struct pkgiterator *it;
- struct pkginfo *pigp;
+ struct pkginfo *pkg;
struct pkgbin *pifp;
const char *which;
struct atomic_file *file;
@@ -474,17 +478,17 @@ 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_pkg(it)) != NULL) {
- pifp = (flags & wdb_dump_available) ? &pigp->available : &pigp->installed;
+ while ((pkg = pkg_db_iter_next_pkg(it)) != NULL) {
+ pifp = (flags & wdb_dump_available) ? &pkg->available : &pkg->installed;
/* Don't dump records which have no useful content. */
- if (!pkg_is_informative(pigp, pifp))
+ if (!pkg_is_informative(pkg, pifp))
continue;
- varbufrecord(&vb,pigp,pifp);
+ varbufrecord(&vb, pkg, pifp);
varbuf_add_char(&vb, '\n');
varbuf_end_str(&vb);
if (fputs(vb.buf, file->fp) < 0)
ohshite(_("failed to write %s database record about '%.50s' to
'%.250s'"),
- which, pkgbin_name(pigp, pifp, pnaw_nonambig), filename);
+ which, pkgbin_name(pkg, pifp, pnaw_nonambig), filename);
varbuf_reset(&vb);
}
pkg_db_iter_free(it);
diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c
index a04b741..a7a46f4 100644
--- a/lib/dpkg/fields.c
+++ b/lib/dpkg/fields.c
@@ -82,7 +82,7 @@ parse_nv_last(struct parsedb_state *ps,
}
void
-f_name(struct pkginfo *pigp, struct pkgbin *pifp,
+f_name(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -92,11 +92,11 @@ f_name(struct pkginfo *pigp, struct pkgbin *pifp,
if (e != NULL)
parse_error(ps, _("invalid package name (%.250s)"), e);
/* We use the new name, as pkg_db_find_set() may have done a tolower for us.
*/
- pigp->set->name = pkg_db_find_set(value)->name;
+ pkg->set->name = pkg_db_find_set(value)->name;
}
void
-f_filecharf(struct pkginfo *pigp, struct pkgbin *pifp,
+f_filecharf(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -110,8 +110,8 @@ f_filecharf(struct pkginfo *pigp, struct pkgbin *pifp,
parse_error(ps,
_("file details field `%s' not allowed in status file"),
fip->name);
- allowextend= !pigp->files;
- fdpp= &pigp->files;
+ allowextend = !pkg->files;
+ fdpp = &pkg->files;
cpos= nfstrsave(value);
while (*cpos) {
space= cpos; while (*space && !isspace(*space)) space++;
@@ -140,7 +140,7 @@ f_filecharf(struct pkginfo *pigp, struct pkgbin *pifp,
}
void
-f_charfield(struct pkginfo *pigp, struct pkgbin *pifp,
+f_charfield(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -148,7 +148,7 @@ f_charfield(struct pkginfo *pigp, struct pkgbin *pifp,
}
void
-f_boolean(struct pkginfo *pigp, struct pkgbin *pifp,
+f_boolean(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -163,7 +163,7 @@ f_boolean(struct pkginfo *pigp, struct pkgbin *pifp,
}
void
-f_multiarch(struct pkginfo *pigp, struct pkgbin *pifp,
+f_multiarch(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -178,7 +178,7 @@ f_multiarch(struct pkginfo *pigp, struct pkgbin *pifp,
}
void
-f_architecture(struct pkginfo *pigp, struct pkgbin *pifp,
+f_architecture(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -189,27 +189,28 @@ f_architecture(struct pkginfo *pigp, struct pkgbin *pifp,
}
void
-f_section(struct pkginfo *pigp, struct pkgbin *pifp,
+f_section(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
if (!*value) return;
- pigp->section= nfstrsave(value);
+ pkg->section = nfstrsave(value);
}
void
-f_priority(struct pkginfo *pigp, struct pkgbin *pifp,
+f_priority(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
if (!*value) return;
- pigp->priority = parse_nv_last(ps, _("word in `priority' field"),
- priorityinfos, value);
- if (pigp->priority == pri_other) pigp->otherpriority= nfstrsave(value);
+ pkg->priority = parse_nv_last(ps, _("word in `priority' field"),
+ priorityinfos, value);
+ if (pkg->priority == pri_other)
+ pkg->otherpriority = nfstrsave(value);
}
void
-f_status(struct pkginfo *pigp, struct pkgbin *pifp,
+f_status(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -219,19 +220,16 @@ f_status(struct pkginfo *pigp, struct pkgbin *pifp,
if (ps->flags & pdb_recordavailable)
return;
- pigp->want = parse_nv_next(ps,
- _("first (want) word in `status' field"),
- wantinfos, &value);
- pigp->eflag = parse_nv_next(ps,
- _("second (error) word in `status' field"),
- eflaginfos, &value);
- pigp->status = parse_nv_last(ps,
- _("third (status) word in `status' field"),
- statusinfos, value);
+ pkg->want = parse_nv_next(ps, _("first (want) word in `status' field"),
+ wantinfos, &value);
+ pkg->eflag = parse_nv_next(ps, _("second (error) word in `status' field"),
+ eflaginfos, &value);
+ pkg->status = parse_nv_last(ps, _("third (status) word in `status' field"),
+ statusinfos, value);
}
void
-f_version(struct pkginfo *pigp, struct pkgbin *pifp,
+f_version(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -240,7 +238,7 @@ f_version(struct pkginfo *pigp, struct pkgbin *pifp,
}
void
-f_revision(struct pkginfo *pigp, struct pkgbin *pifp,
+f_revision(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -258,7 +256,7 @@ f_revision(struct pkginfo *pigp, struct pkgbin *pifp,
}
void
-f_configversion(struct pkginfo *pigp, struct pkgbin *pifp,
+f_configversion(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -268,7 +266,7 @@ f_configversion(struct pkginfo *pigp, struct pkgbin *pifp,
if (ps->flags & pdb_recordavailable)
return;
- parse_db_version(ps, &pigp->configversion, value,
+ parse_db_version(ps, &pkg->configversion, value,
_("error in Config-Version string '%.250s'"), value);
}
@@ -300,7 +298,7 @@ malformed:
}
void
-f_conffiles(struct pkginfo *pigp, struct pkgbin *pifp,
+f_conffiles(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -353,7 +351,7 @@ f_conffiles(struct pkginfo *pigp, struct pkgbin *pifp,
}
void
-f_dependency(struct pkginfo *pigp, struct pkgbin *pifp,
+f_dependency(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip)
{
@@ -409,7 +407,7 @@ f_dependency(struct pkginfo *pigp, struct pkgbin *pifp,
dop->ed = pkg_db_find_set(depname.buf);
dop->next= NULL; *ldopp= dop; ldopp= &dop->next;
- /* Don't link this (which is after all only ‘newpig’ from
+ /* Don't link this (which is after all only ‘new_pkg’ from
* the main parsing loop in parsedb) into the depended on
* packages' lists yet. This will be done later when we
* install this (in parse.c). For the moment we do the
diff --git a/lib/dpkg/parsedump.h b/lib/dpkg/parsedump.h
index 2205266..220c1c6 100644
--- a/lib/dpkg/parsedump.h
+++ b/lib/dpkg/parsedump.h
@@ -76,7 +76,7 @@ bool parse_stanza(struct parsedb_state *ps, struct
field_state *fs,
#define FILEFOFF(f) (offsetof(struct filedetails, f))
#define FILEFFIELD(filedetail,of,type) (*(type*)((char*)(filedetail)+(of)))
-typedef void freadfunction(struct pkginfo *pigp, struct pkgbin *pifp,
+typedef void freadfunction(struct pkginfo *pkg, struct pkgbin *pifp,
struct parsedb_state *ps,
const char *value, const struct fieldinfo *fip);
freadfunction f_name, f_charfield, f_priority, f_section, f_status,
f_filecharf;
diff --git a/lib/dpkg/pkg-db.c b/lib/dpkg/pkg-db.c
index 7f4baa9..6722a61 100644
--- a/lib/dpkg/pkg-db.c
+++ b/lib/dpkg/pkg-db.c
@@ -260,7 +260,7 @@ pkg_db_count_pkg(void)
}
struct pkgiterator {
- struct pkginfo *pigp;
+ struct pkginfo *pkg;
int nbinn;
};
@@ -277,7 +277,7 @@ pkg_db_iter_new(void)
struct pkgiterator *iter;
iter = m_malloc(sizeof(struct pkgiterator));
- iter->pigp = NULL;
+ iter->pkg = NULL;
iter->nbinn = 0;
return iter;
@@ -297,19 +297,19 @@ pkg_db_iter_next_set(struct pkgiterator *iter)
{
struct pkgset *set;
- while (!iter->pigp) {
+ while (!iter->pkg) {
if (iter->nbinn >= BINS)
return NULL;
if (bins[iter->nbinn])
- iter->pigp = &bins[iter->nbinn]->pkg;
+ iter->pkg = &bins[iter->nbinn]->pkg;
iter->nbinn++;
}
- set = iter->pigp->set;
+ set = iter->pkg->set;
if (set->next)
- iter->pigp = &set->next->pkg;
+ iter->pkg = &set->next->pkg;
else
- iter->pigp = NULL;
+ iter->pkg = NULL;
return set;
}
@@ -332,21 +332,21 @@ pkg_db_iter_next_pkg(struct pkgiterator *iter)
{
struct pkginfo *r;
- while (!iter->pigp) {
+ while (!iter->pkg) {
if (iter->nbinn >= BINS)
return NULL;
if (bins[iter->nbinn])
- iter->pigp = &bins[iter->nbinn]->pkg;
+ iter->pkg = &bins[iter->nbinn]->pkg;
iter->nbinn++;
}
- r = iter->pigp;
+ r = iter->pkg;
if (r->arch_next)
- iter->pigp = r->arch_next;
+ iter->pkg = r->arch_next;
else if (r->set->next)
- iter->pigp = &r->set->next->pkg;
+ iter->pkg = &r->set->next->pkg;
else
- iter->pigp = NULL;
+ iter->pkg = NULL;
return r;
}
diff --git a/src/archives.c b/src/archives.c
index 6687307..0765d4c 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -268,17 +268,17 @@ struct pkg_deconf_list *deconfigure = NULL;
static time_t currenttime;
static int
-does_replace(struct pkginfo *newpigp, struct pkgbin *newpifp,
- struct pkginfo *oldpigp, struct pkgbin *oldpifp)
+does_replace(struct pkginfo *new_pkg, struct pkgbin *newpifp,
+ struct pkginfo *old_pkg, struct pkgbin *oldpifp)
{
struct dependency *dep;
debug(dbg_depcon,"does_replace new=%s old=%s (%s)",
- pkgbin_name(newpigp, newpifp, pnaw_always),
- pkgbin_name(oldpigp, oldpifp, pnaw_always),
+ pkgbin_name(new_pkg, newpifp, pnaw_always),
+ pkgbin_name(old_pkg, oldpifp, pnaw_always),
versiondescribe(&oldpifp->version, vdew_always));
for (dep= newpifp->depends; dep; dep= dep->next) {
- if (dep->type != dep_replaces || dep->list->ed != oldpigp->set)
+ if (dep->type != dep_replaces || dep->list->ed != old_pkg->set)
continue;
debug(dbg_depcondetail,"does_replace ... found old, version %s",
versiondescribe(&dep->list->version,vdew_always));
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
