Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2e1ff21
libpkg: remove redundant pkg_jobs->count field
Isaac Freund committed 1 year ago
commit 2e1ff21cd571da890cd264cc505c0acca6b01be3
parent 6cf0540
4 files changed +1 -9
modified libpkg/pkg_cudf.c
@@ -408,13 +408,11 @@ pkg_jobs_cudf_add_package(struct pkg_jobs *j, struct pkg_cudf_entry *entry)
			pkg_debug(3, "pkg_cudf: schedule installation of %s(%d)",

					entry->uid, ver);

			pkg_jobs_cudf_insert_res_job (&j->jobs, selected, NULL, PKG_SOLVED_INSTALL);
- 
			j->count ++;

		}

		else if (!entry->installed && selected->pkg->type == PKG_INSTALLED) {

			pkg_debug(3, "pkg_cudf: schedule removing of %s(%d)",

					entry->uid, ver);

			pkg_jobs_cudf_insert_res_job (&j->jobs, selected, NULL, PKG_SOLVED_DELETE);
- 
			j->count ++;

		}

	}

	else {
@@ -431,7 +429,6 @@ pkg_jobs_cudf_add_package(struct pkg_jobs *j, struct pkg_cudf_entry *entry)
		/* XXX: this is a hack due to iterators stupidity */

		selected->pkg->old_version = old->pkg->version;

		pkg_jobs_cudf_insert_res_job (&j->jobs, selected, old, PKG_SOLVED_UPGRADE);
- 
		j->count ++;

	}



	return (EPKG_OK);
modified libpkg/pkg_jobs.c
@@ -597,7 +597,6 @@ pkg_jobs_set_execute_priority(struct pkg_jobs *j, struct pkg_solved *solved)
			solved->type = PKG_SOLVED_UPGRADE_INSTALL;

			solved->xlink = ts;

			tll_push_back(j->jobs, ts);
- 
			j->count++;

			dbg(2, "split upgrade request for %s",

			   ts->items[0]->pkg->uid);

			return (EPKG_CONFLICT);
@@ -1969,7 +1968,6 @@ pkg_jobs_check_and_solve_conflicts(struct pkg_jobs *j, bool *found_conflicts)
		}

		/* Cleanup solver results */

		tll_free_and_free(j->jobs, free);
- 
		j->count = 0;

		rc = pkg_jobs_run_solver(j);

		if (rc != EPKG_OK) {

			break;
@@ -2018,7 +2016,7 @@ pkg_jobs_count(struct pkg_jobs *j)
{

	assert(j != NULL);
- 
	return (j->count);
+ 
	return (tll_length(j->jobs));

}



int
modified libpkg/pkg_solve.c
@@ -1279,7 +1279,6 @@ pkg_solve_insert_res_job (struct pkg_solve_variable *var,
				dbg(3, "pkg_solve: schedule upgrade of %s from %s to %s",

					del_var->uid, del_var->digest, add_var->digest);

			}
- 
			j->count ++;

		}



		/*
@@ -1299,7 +1298,6 @@ pkg_solve_insert_res_job (struct pkg_solve_variable *var,
				tll_push_back(j->jobs, res);

				dbg(3, "schedule deletion of %s %s",

					cur_var->uid, cur_var->digest);
- 
				j->count ++;

			}

		}

	}
modified libpkg/private/pkg_jobs.h
@@ -103,7 +103,6 @@ struct pkg_jobs {
	pkg_jobs_t	 type;

	pkg_flags	 flags;

	bool solved;
- 
	int count;

	int total;

	int conflicts_registered;

	bool need_fetch;