Skip to content

Commit f88fd01

Browse files
markjdbbapt
authored andcommitted
libpkg: Remove an unused parameter from pkg_jobs_universe_add_pkg()
No functional change intended.
1 parent 7a64b3f commit f88fd01

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

libpkg/pkg_jobs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ pkg_jobs_add_req(struct pkg_jobs *j, struct pkg *pkg)
395395

396396
dbg(4, "add package %s-%s to the request", pkg->name,
397397
pkg->version);
398-
rc = pkg_jobs_universe_add_pkg(j->universe, pkg, false, &un);
398+
rc = pkg_jobs_universe_add_pkg(j->universe, pkg, &un);
399399

400400
if (rc == EPKG_END) {
401401
/*
@@ -950,7 +950,7 @@ pkg_jobs_find_upgrade(struct pkg_jobs *j, const char *pattern, match_t m)
950950

951951
dbg(2, "non-automatic package with pattern %s has not been found in "
952952
"remote repo", pattern);
953-
rc = pkg_jobs_universe_add_pkg(j->universe, p, false, &unit);
953+
rc = pkg_jobs_universe_add_pkg(j->universe, p, &unit);
954954
if (rc == EPKG_OK) {
955955
rc = pkg_jobs_guess_upgrade_candidate(j, pattern);
956956
}

libpkg/pkg_jobs_universe.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ pkg_jobs_universe_get_remote(struct pkg_jobs_universe *universe,
151151
*/
152152
int
153153
pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe, struct pkg *pkg,
154-
bool force __unused, struct pkg_job_universe_item **found)
154+
struct pkg_job_universe_item **found)
155155
{
156156
struct pkg_job_universe_item *item, *seen, *tmp = NULL;
157157

@@ -575,7 +575,7 @@ pkg_jobs_universe_process_item(struct pkg_jobs_universe *universe, struct pkg *p
575575
* Add pkg itself. If package is already seen then we check the `processed`
576576
* flag that means that we have already tried to check our universe
577577
*/
578-
rc = pkg_jobs_universe_add_pkg(universe, pkg, false, &found);
578+
rc = pkg_jobs_universe_add_pkg(universe, pkg, &found);
579579
if (rc == EPKG_CONFLICT)
580580
return (rc);
581581

@@ -1036,12 +1036,13 @@ pkg_jobs_universe_get_upgrade_candidates(struct pkg_jobs_universe *universe,
10361036

10371037
if (lp != NULL) {
10381038
/* Add local package to the universe as well */
1039-
pkg_jobs_universe_add_pkg(universe, lp, false, NULL);
1039+
pkg_jobs_universe_add_pkg(universe, lp, NULL);
10401040
}
10411041
if (selected != lp) {
10421042
/* We need to add the whole chain of upgrade candidates */
10431043
vec_rforeach(candidates, i) {
1044-
pkg_jobs_universe_add_pkg(universe, candidates.d[i], force, NULL);
1044+
pkg_jobs_universe_add_pkg(universe, candidates.d[i],
1045+
NULL);
10451046
}
10461047
}
10471048
else {

libpkg/private/pkg_jobs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ struct pkg_job_universe_item* pkg_jobs_universe_find(struct pkg_jobs_universe
206206
* Add a single package to the universe
207207
*/
208208
int pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe,
209-
struct pkg *pkg, bool force, struct pkg_job_universe_item **found);
209+
struct pkg *pkg, struct pkg_job_universe_item **found);
210210

211211
/*
212212
* Find local package in db or universe

0 commit comments

Comments
 (0)