From edb7f6a197ff0c206b17e2e922611c0a0714f266 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 22 Feb 2024 00:57:09 +0100 Subject: [PATCH] dpkg-query: Rename rc variables tracking no matches to misses This makes it more clear what the variable is tracking, as we are not returning a return code but the actual amount of missed matches. Changelog: internal --- src/query/main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/query/main.c b/src/query/main.c index e237b9867..bb359ea84 100644 --- a/src/query/main.c +++ b/src/query/main.c @@ -69,7 +69,7 @@ pkg_array_match_patterns(struct pkg_array *array, const char *const *argv) { int argc, i, ip, *found; - int rc = 0; + int misses = 0; struct pkg_spec *ps; for (argc = 0; argv[argc]; argc++); @@ -101,7 +101,7 @@ pkg_array_match_patterns(struct pkg_array *array, for (ip = 0; ip < argc; ip++) { if (!found[ip]) { notice(_("no packages found matching %s"), argv[ip]); - rc++; + misses++; } pkg_spec_destroy(&ps[ip]); } @@ -109,7 +109,7 @@ pkg_array_match_patterns(struct pkg_array *array, free(ps); free(found); - return rc; + return misses; } struct list_format { @@ -250,7 +250,7 @@ static int listpackages(const char *const *argv) { struct pkg_array array; - int rc = 0; + int misses = 0; struct list_format fmt; struct pager *pager; @@ -279,7 +279,7 @@ listpackages(const char *const *argv) pkg_array_foreach(&array, pkg_array_list_item, &fmt); } else { - rc = pkg_array_match_patterns(&array, pkg_array_list_item, &fmt, argv); + misses = pkg_array_match_patterns(&array, pkg_array_list_item, &fmt, argv); } m_output(stdout, _("")); @@ -290,7 +290,7 @@ listpackages(const char *const *argv) pkg_array_destroy(&array); modstatdb_shutdown(); - return !!rc; + return !!misses; } static int @@ -566,7 +566,7 @@ showpackages(const char *const *argv) struct pkg_array array; struct pkg_format_node *fmt; bool fmt_needs_db_fsys; - int rc = 0; + int misses = 0; fmt = pkg_format_parse(opt_showformat, &err); if (!fmt) { @@ -601,7 +601,7 @@ showpackages(const char *const *argv) } else { if (fmt_needs_db_fsys) pkg_array_foreach(&array, pkg_array_load_db_fsys, NULL); - rc = pkg_array_match_patterns(&array, pkg_array_show_item, fmt, argv); + misses = pkg_array_match_patterns(&array, pkg_array_show_item, fmt, argv); } m_output(stdout, _("")); @@ -611,7 +611,7 @@ showpackages(const char *const *argv) pkg_format_free(fmt); modstatdb_shutdown(); - return !!rc; + return !!misses; } static bool -- 2.11.4.GIT