Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › b5921eb
Requests are now hashed by universe ptr.
Vsevolod Stakhov committed 11 years ago
commit b5921ebb26acd2e0eb361a4602e90e656a07c513
parent eb28ccd
1 file changed +6 -6
modified libpkg/pkg_jobs.c
@@ -263,7 +263,7 @@ pkg_jobs_add_req(struct pkg_jobs *j, const char *uid,
	else

		head = &j->request_delete;
- 
	HASH_FIND(hh, *head, uid, strlen(uid), test);
+ 
	HASH_FIND_PTR(*head, item, test);



	if (test != NULL)

		return;
@@ -275,7 +275,7 @@ pkg_jobs_add_req(struct pkg_jobs *j, const char *uid,
	}

	req->item = item;
- 
	HASH_ADD_KEYPTR(hh, *head, uid, strlen(uid), req);
+ 
	HASH_ADD_PTR(*head, item, req);

}



static int
@@ -482,7 +482,7 @@ pkg_jobs_process_remote_pkg(struct pkg_jobs *j, struct pkg *p,
		}

		else {

			/* However, we may want to add it to the job request */
- 
			HASH_FIND_STR(j->request_add, uid, jreq);
+ 
			HASH_FIND_PTR(j->request_add, seen->un, jreq);

			if (jreq == NULL)

				pkg_jobs_add_req(j, uid, seen->un);

			if (force) {
@@ -966,7 +966,7 @@ pkg_jobs_propagate_automatic(struct pkg_jobs *j)
			 * we search them in the corresponding request

			 */

			pkg_get(unit->pkg, PKG_UNIQUEID, &uid);
- 
			HASH_FIND_STR(j->request_add, uid, req);
+ 
			HASH_FIND_PTR(j->request_add, unit, req);

			if (req == NULL && unit->pkg->type != PKG_INSTALLED) {

				automatic = 1;

				pkg_debug(2, "set automatic flag for %s", uid);
@@ -999,7 +999,7 @@ pkg_jobs_propagate_automatic(struct pkg_jobs *j)
				 */

				if (j->type == PKG_JOBS_INSTALL) {

					pkg_get(local->pkg, PKG_UNIQUEID, &uid);
- 
					HASH_FIND_STR(j->request_add, uid, req);
+ 
					HASH_FIND_PTR(j->request_add, local, req);

					if (req != NULL)

						automatic = 0;

				}
@@ -1030,7 +1030,7 @@ pkg_jobs_find_deinstall_request(struct pkg_job_universe_item *item,
		return (NULL);

	}
- 
	HASH_FIND_STR(j->request_delete, uid, found);
+ 
	HASH_FIND_PTR(j->request_delete, item, found);

	if (found == NULL) {

		while (pkg_deps(pkg, &d) == EPKG_OK) {

			dep_item = pkg_jobs_universe_find(j->universe, d->uid);