Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 38b097d
libpkg: remove some more unused function parameters
Robin Hahling committed 11 years ago
commit 38b097d0552bf1a8b5854ccb84f3ed0f29df5df8
parent 5393c2a
5 files changed +9 -14
modified libpkg/pkg.h.in
@@ -1086,7 +1086,7 @@ int pkg_solve_sat_to_jobs(struct pkg_solve_problem *problem);
 * Parse SAT solver output and convert it to jobs

 * @return error code

 */
- 
int pkg_solve_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);



/**

 * Free a SAT problem structure
modified libpkg/pkg_jobs.c
@@ -1655,7 +1655,7 @@ again:
					fclose(spipe[1]);



					if (ret == EPKG_OK) {
- 
						ret = pkg_solve_parse_sat_output(spipe[0], problem, j);
+ 
						ret = pkg_solve_parse_sat_output(spipe[0], problem);

					}



					fclose(spipe[0]);
@@ -1760,7 +1760,7 @@ pkg_jobs_type(struct pkg_jobs *j)
}



static int
- 
pkg_jobs_handle_install(struct pkg_solved *ps, struct pkg_jobs *j, bool handle_rc,
+ 
pkg_jobs_handle_install(struct pkg_solved *ps, struct pkg_jobs *j,

		struct pkg_manifest_key *keys)

{

	struct pkg *new, *old;
@@ -1830,7 +1830,6 @@ pkg_jobs_execute(struct pkg_jobs *j)
	struct pkg_manifest_key *keys = NULL;

	int flags = 0;

	int retcode = EPKG_FATAL;
- 
	bool handle_rc = false;



	if (j->flags & PKG_FLAG_SKIP_INSTALL)

		return (EPKG_OK);
@@ -1841,8 +1840,6 @@ pkg_jobs_execute(struct pkg_jobs *j)
	if ((j->flags & PKG_FLAG_NOSCRIPT) == PKG_FLAG_NOSCRIPT)

		flags |= PKG_DELETE_NOSCRIPT;
- 
	handle_rc = pkg_object_bool(pkg_config_get("HANDLE_RC_SCRIPTS"));
- 


	retcode = pkgdb_upgrade_lock(j->db, PKGDB_LOCK_ADVISORY,

			PKGDB_LOCK_EXCLUSIVE);

	if (retcode != EPKG_OK)
@@ -1881,14 +1878,12 @@ pkg_jobs_execute(struct pkg_jobs *j)
				goto cleanup;

			break;

		case PKG_SOLVED_INSTALL:
- 
			retcode = pkg_jobs_handle_install(ps,
- 
					j, handle_rc, keys);
+ 
			retcode = pkg_jobs_handle_install(ps, j, keys);

			if (retcode != EPKG_OK)

				goto cleanup;

			break;

		case PKG_SOLVED_UPGRADE:
- 
			retcode = pkg_jobs_handle_install(ps,
- 
					j, handle_rc, keys);
+ 
			retcode = pkg_jobs_handle_install(ps, j, keys);

			if (retcode != EPKG_OK)

				goto cleanup;

			break;
modified libpkg/pkg_ports.c
@@ -1071,7 +1071,7 @@ flush_script_buffer(struct sbuf *buf, struct pkg *p, int type)
}



int
- 
plist_parse_line(struct pkg *pkg, struct plist *plist, char *line)
+ 
plist_parse_line(struct plist *plist, char *line)

{

	char *keyword, *buf;
@@ -1202,7 +1202,7 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage)
	while ((linelen = getline(&line, &linecap, plist_f)) > 0) {

		if (line[linelen - 1] == '\n')

			line[linelen - 1] = '\0';
- 
		ret = plist_parse_line(pkg, pplist, line);
+ 
		ret = plist_parse_line(pplist, line);

		if (rc == EPKG_OK)

			rc = ret;

	}
modified libpkg/pkg_solve.c
@@ -1054,7 +1054,7 @@ pkg_solve_sat_to_jobs(struct pkg_solve_problem *problem)
}



int
- 
pkg_solve_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_solve_ordered_variable *ordered_variables = NULL, *nord;

	struct pkg_solve_variable *var;
modified libpkg/private/pkg.h
@@ -646,7 +646,7 @@ void pkg_delete_file(struct pkg *pkg, struct pkg_file *file, unsigned force);
int pkg_open_root_fd(struct pkg *pkg);

void pkg_add_dir_to_del(struct pkg *pkg, const char *file, const char *dir);

struct plist *plist_new(struct pkg *p, const char *stage);
- 
int plist_parse_line(struct pkg *pkg, struct plist *p, char *line);
+ 
int plist_parse_line(struct plist *p, char *line);

void plist_free(struct plist *);

int pkg_appendscript(struct pkg *pkg, const char *cmd, pkg_script type);