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=f94d12b62e0747791ece6400f31a15fddc3a2d5b commit f94d12b62e0747791ece6400f31a15fddc3a2d5b Author: Guillem Jover <[email protected]> AuthorDate: Tue Jan 15 04:40:33 2019 +0100 dpkg-query: Rename variable to avoid shadowing a local function Warned-by: cppcheck --- debian/changelog | 1 + src/querycmd.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2a756508f..745a79025 100644 --- a/debian/changelog +++ b/debian/changelog @@ -108,6 +108,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium declaration. - dpkg: Split trigger processing types into required, try-queued and try-deferred. + - dpkg-query: Rename variable to avoid shadowing a local function. * Build system: - get-version: Use a format string with printf. - run-script: Use $() instead of deprecated ``. diff --git a/src/querycmd.c b/src/querycmd.c index 173c4ad91..0dba74856 100644 --- a/src/querycmd.c +++ b/src/querycmd.c @@ -639,16 +639,16 @@ pkg_infodb_print_filetype(const char *filename, const char *filetype) static void control_path_file(struct pkginfo *pkg, const char *control_file) { - const char *control_path; + const char *control_pathname; struct stat st; - control_path = pkg_infodb_get_file(pkg, &pkg->installed, control_file); - if (stat(control_path, &st) < 0) + control_pathname = pkg_infodb_get_file(pkg, &pkg->installed, control_file); + if (stat(control_pathname, &st) < 0) return; if (!S_ISREG(st.st_mode)) return; - pkg_infodb_print_filename(control_path, control_file); + pkg_infodb_print_filename(control_pathname, control_file); } static int -- Dpkg.Org's dpkg
