This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=18a0a2fcc413f136c9840bbb3818a5a4457a8228 commit 18a0a2fcc413f136c9840bbb3818a5a4457a8228 Author: Guillem Jover <[email protected]> AuthorDate: Sun Nov 18 05:30:36 2018 +0100 dselect: Rename variable r to pkgbin This makes it clear what the variable is all about. --- debian/changelog | 1 + dselect/pkgdepcon.cc | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c056e6a7e..d48eb25cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium try-deferred. - dpkg-query: Rename variable to avoid shadowing a local function. - When allocating use the variable instead of the type in sizeof(). + - dselect: Rename variable r to pkgbin. * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc index 2104d2c8c..3b54e7f89 100644 --- a/dselect/pkgdepcon.cc +++ b/dselect/pkgdepcon.cc @@ -50,12 +50,13 @@ packagelist::useavailable(pkginfo *pkg) pkgbin * packagelist::find_pkgbin(pkginfo *pkg) { - pkgbin *r; - r= useavailable(pkg) ? &pkg->available : &pkg->installed; + pkgbin *pkgbin; + + pkgbin = useavailable(pkg) ? &pkg->available : &pkg->installed; debug(dbg_general, "packagelist[%p]::find_pkgbin(%s) useavailable=%d", - this, pkgbin_name(pkg, r, pnaw_always), useavailable(pkg)); + this, pkgbin_name(pkg, pkgbin, pnaw_always), useavailable(pkg)); - return r; + return pkgbin; } int packagelist::checkdependers(pkginfo *pkg, int changemade) { -- Dpkg.Org's dpkg
