7b88db6 Enable SAT solver parser. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Enable SAT solver parser.

Vsevolod Stakhov committed 12 years ago

commit 7b88db607aa36a8c1b23a55decac2d5cb6f25e75
parent be86250

3 files changed +3 -3

modified libpkg/pkg.h.in

@@ -1195,7 +1195,7 @@ int pkg_solve_sat_to_jobs(struct pkg_solve_problem *problem, struct pkg_jobs *j)

  * Parse SAT solver output and convert it to jobs
  * @return error code
  */
 int pkg_parse_sat_output(FILE *f, struct pkg_solve_problem *problem, struct pkg_jobs *j);
 int pkg_solve_parse_sat_output(FILE *f, struct pkg_solve_problem *problem, struct pkg_jobs *j);
 /**
  * Free a SAT problem structure

modified libpkg/pkg_jobs.c

@@ -1058,7 +1058,7 @@ pkg_jobs_solve(struct pkg_jobs *j)

 					fclose(spipe[1]);
 					if (ret == EPKG_OK) {
 						/* XXX: add sat solver output parser */
 						ret = pkg_solve_parse_sat_output(spipe[0], problem, j);
 					}
 					fclose(spipe[0]);

modified libpkg/pkg_solve.c

@@ -704,7 +704,7 @@ pkg_solve_sat_to_jobs(struct pkg_solve_problem *problem, struct pkg_jobs *j)

 }
 int
 pkg_parse_sat_output(FILE *f, struct pkg_solve_problem *problem, struct pkg_jobs *j)
 pkg_solve_parse_sat_output(FILE *f, struct pkg_solve_problem *problem, struct pkg_jobs *j)
 {
 	struct pkg_solve_ordered_variable *ordered_variables = NULL, *nord;
 	struct pkg_solve_variable *var, *vtmp;