67bf88c Simplify logic. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Simplify logic.

Vsevolod Stakhov committed 13 years ago

commit 67bf88cdb64065ce88742168c52f46cda4c4e74e
parent f9c1cae

1 file changed +2 -9

modified libpkg/pkg_jobs.c

@@ -283,8 +283,7 @@ jobs_solve_deinstall(struct pkg_jobs *j)

 static bool
 recursive_autoremove(struct pkg_jobs *j)
 {
 	struct pkg *pkg1, *tmp1, *pkg2, *tmp2;
 	struct pkg_dep *dep;
 	struct pkg *pkg1, *tmp1;
 	char *origin;
 	HASH_ITER(hh, j->bulk, pkg1, tmp1) {

@@ -292,13 +291,7 @@ recursive_autoremove(struct pkg_jobs *j)

 			HASH_DEL(j->bulk, pkg1);
 			pkg_get(pkg1, PKG_ORIGIN, &origin);
 			HASH_ADD_KEYPTR(hh, j->jobs, origin, strlen(origin), pkg1);
 			HASH_ITER(hh, j->bulk, pkg2, tmp2) {
 				HASH_FIND_STR(pkg2->rdeps, origin, dep);
 				if (dep != NULL) {
 					HASH_DEL(pkg2->rdeps, dep);
 					pkg_dep_free(dep);
 				}
 			}
 			remove_from_rdeps(j, origin);
 			return (true);
 		}
 	}