diff options
author | Guillem Jover <guillem@debian.org> | 2011-01-14 01:10:00 +0100 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2011-01-16 10:19:21 +0100 |
commit | de553e274645c58b1b45197d962da15e72c1e24c (patch) | |
tree | 86b345f8bc6722346327add8f47637ba77312aaf /dselect/pkgdepcon.cc | |
parent | 2276c6a59c80a0d2558b349203310bb833bdd909 (diff) | |
download | dpkg-de553e274645c58b1b45197d962da15e72c1e24c.tar.gz |
Rename struct pkginfoperfile to struct pkgbin
Diffstat (limited to 'dselect/pkgdepcon.cc')
-rw-r--r-- | dselect/pkgdepcon.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc index 4cebbe664..1489389a9 100644 --- a/dselect/pkgdepcon.cc +++ b/dselect/pkgdepcon.cc @@ -48,11 +48,14 @@ packagelist::useavailable(pkginfo *pkg) return false; } -pkginfoperfile *packagelist::findinfo(pkginfo *pkg) { - pkginfoperfile *r; +pkgbin * +packagelist::find_pkgbin(pkginfo *pkg) +{ + pkgbin *r; r= useavailable(pkg) ? &pkg->available : &pkg->installed; if (debug) - fprintf(debug,"packagelist[%p]::findinfo(%s) useavailable=%d\n",this,pkg->name,useavailable(pkg)); + fprintf(debug, "packagelist[%p]::find_pkgbin(%s) useavailable=%d\n", + this, pkg->name, useavailable(pkg)); return r; } @@ -91,13 +94,13 @@ int packagelist::resolvesuggest() { fprintf(debug,"packagelist[%p]::resolvesuggest() loop[%i] %s / %d\n", this, index, table[index]->pkg->name, changemade); dependency *depends; - for (depends= findinfo(table[index]->pkg)->depends; + for (depends = find_pkgbin(table[index]->pkg)->depends; depends; depends= depends->next) { changemade = max(changemade, resolvedepcon(depends)); } changemade= checkdependers(table[index]->pkg,changemade); - for (depends= findinfo(table[index]->pkg)->depends; + for (depends = find_pkgbin(table[index]->pkg)->depends; depends; depends= depends->next) { if (depends->type != dep_provides) continue; |