summaryrefslogtreecommitdiff
path: root/dselect/pkgdepcon.cc
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2010-06-26 13:16:17 +0200
committerGuillem Jover <guillem@debian.org>2010-06-27 11:12:38 +0200
commitb8799d9f107b23d8640ae7db852499f399792083 (patch)
treee4cb9f6951a5f8de717b3d3948f43b15fd03c143 /dselect/pkgdepcon.cc
parentc69901cdda6500450f026d02b439b941e7cb147a (diff)
downloaddpkg-b8799d9f107b23d8640ae7db852499f399792083.tar.gz
Use consistent naming for linked lists members
Use next/prev instead of next/back (which would complement forward). Also move next to the end of member names and seprate it with an underscore, to simulate it being a sub struct member.
Diffstat (limited to 'dselect/pkgdepcon.cc')
-rw-r--r--dselect/pkgdepcon.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 9caa9ee85..ca69ec74d 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -60,12 +60,12 @@ pkginfoperfile *packagelist::findinfo(pkginfo *pkg) {
int packagelist::checkdependers(pkginfo *pkg, int changemade) {
struct deppossi *possi;
- for (possi = pkg->available.depended; possi; possi = possi->nextrev) {
+ for (possi = pkg->available.depended; possi; possi = possi->rev_next) {
if (!useavailable(possi->up->up))
continue;
changemade = max(changemade, resolvedepcon(possi->up));
}
- for (possi = pkg->installed.depended; possi; possi = possi->nextrev) {
+ for (possi = pkg->installed.depended; possi; possi = possi->rev_next) {
if (useavailable(possi->up->up))
continue;
changemade = max(changemade, resolvedepcon(possi->up));
@@ -274,7 +274,7 @@ int packagelist::resolvedepcon(dependency *depends) {
if (dep_update_best_to_change_stop(best, possi->ed)) goto mustdeselect;
for (provider = possi->ed->available.depended;
provider;
- provider= provider->nextrev) {
+ provider = provider->rev_next) {
if (provider->up->type != dep_provides) continue;
if (provider->up->up->clientdata) foundany= 1;
if (dep_update_best_to_change_stop(best, provider->up->up)) goto mustdeselect;
@@ -340,7 +340,7 @@ int packagelist::resolvedepcon(dependency *depends) {
}
for (provider = depends->list->ed->available.depended;
provider;
- provider= provider->nextrev) {
+ provider = provider->rev_next) {
if (provider->up->type != dep_provides) continue;
if (provider->up->up == depends->up) continue; // conflicts & provides same thing
r= deselect_one_of(depends->up, provider->up->up, depends); if (r) return r;
@@ -398,7 +398,7 @@ packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade)
for (provider = possi->ed->installed.depended;
provider;
- provider = provider->nextrev) {
+ provider = provider->rev_next) {
if (provider->up->type == dep_provides &&
provider->up->up->clientdata &&
!useavailable(provider->up->up) &&
@@ -408,7 +408,7 @@ packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade)
}
for (provider = possi->ed->available.depended;
provider;
- provider = provider->nextrev) {
+ provider = provider->rev_next) {
if (provider->up->type != dep_provides ||
!provider->up->up->clientdata ||
!would_like_to_install(provider->up->up->clientdata->selected,