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=35845f9962dfe2a004a6509c8d0850b4af1ae597 commit 35845f9962dfe2a004a6509c8d0850b4af1ae597 Author: Guillem Jover <[email protected]> AuthorDate: Sun Nov 18 05:32:47 2018 +0100 libdpkg, dpkg: Rename r variables to fnn --- debian/changelog | 1 + lib/dpkg/fsys-hash.c | 8 ++++---- src/help.c | 17 +++++++---------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index d48eb25cb..100195c75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -111,6 +111,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium - 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. + - libdpkg, dpkg: Rename r variables to fnn. * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c index 0190d94fb..9648d5bb1 100644 --- a/lib/dpkg/fsys-hash.c +++ b/lib/dpkg/fsys-hash.c @@ -151,17 +151,17 @@ files_db_iter_new(void) struct filenamenode * files_db_iter_next(struct fileiterator *iter) { - struct filenamenode *r= NULL; + struct filenamenode *fnn = NULL; while (!iter->namenode) { if (iter->nbinn >= BINS) return NULL; iter->namenode = bins[iter->nbinn++]; } - r = iter->namenode; - iter->namenode = r->next; + fnn = iter->namenode; + iter->namenode = fnn->next; - return r; + return fnn; } void diff --git a/src/help.c b/src/help.c index e4db356bd..1859c34d1 100644 --- a/src/help.c +++ b/src/help.c @@ -53,28 +53,25 @@ struct filenamenode * namenodetouse(struct filenamenode *namenode, struct pkginfo *pkg, struct pkgbin *pkgbin) { - struct filenamenode *r; + struct filenamenode *fnn; - if (!namenode->divert) { - r = namenode; - return r; - } + if (!namenode->divert) + return namenode; debug(dbg_eachfile, "namenodetouse namenode='%s' pkg=%s", namenode->name, pkgbin_name(pkg, pkgbin, pnaw_always)); - r= - (namenode->divert->useinstead && namenode->divert->pkgset != pkg->set) - ? namenode->divert->useinstead : namenode; + fnn = (namenode->divert->useinstead && namenode->divert->pkgset != pkg->set) + ? namenode->divert->useinstead : namenode; debug(dbg_eachfile, "namenodetouse ... useinstead=%s camefrom=%s pkg=%s return %s", namenode->divert->useinstead ? namenode->divert->useinstead->name : "<none>", namenode->divert->camefrom ? namenode->divert->camefrom->name : "<none>", namenode->divert->pkgset ? namenode->divert->pkgset->name : "<none>", - r->name); + fnn->name); - return r; + return fnn; } bool -- Dpkg.Org's dpkg
