Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › b8ab113
libpkg: remove some unused function parameters
Robin Hahling committed 11 years ago
commit b8ab1137e3866662d998afe60f47b9404e82f779
parent 1bec4a8
4 files changed +11 -11
modified libpkg/backup.c
@@ -54,7 +54,7 @@ ps_cb(void *ps, int ncols, char **coltext, __unused char **colnames)
}



static int
- 
copy_database(sqlite3 *src, sqlite3 *dst, const char *name)
+ 
copy_database(sqlite3 *src, sqlite3 *dst)

{

	sqlite3_backup	*b;

	char		*errmsg;
@@ -147,7 +147,7 @@ pkgdb_dump(struct pkgdb *db, const char *dest)
	}



	pkg_emit_backup();
- 
	ret = copy_database(db->sqlite, backup, dest);
+ 
	ret = copy_database(db->sqlite, backup);



	sqlite3_close(backup);
@@ -174,7 +174,7 @@ pkgdb_load(struct pkgdb *db, const char *src)
	}



	pkg_emit_restore();
- 
	ret = copy_database(restore, db->sqlite, src);
+ 
	ret = copy_database(restore, db->sqlite);



	sqlite3_close(restore);
modified libpkg/pkg_add.c
@@ -81,7 +81,7 @@ pkg_add_file_random_suffix(char *buf, int buflen, int suflen)
}



static void
- 
attempt_to_merge(bool renamed, const struct pkg_file *rf, struct pkg_config_file *rcf,
+ 
attempt_to_merge(bool renamed, struct pkg_config_file *rcf,

  struct pkg *local, char *pathname, const char *path, struct sbuf *newconf)

{

	const struct pkg_file *lf = NULL;
@@ -222,7 +222,7 @@ do_extract(struct archive *a, struct archive_entry *ae, const char *location,
		 * check if the file is already provided by previous package

		 */

		if (!automerge)
- 
			attempt_to_merge(renamed, rf, rcf, local, pathname, path, newconf);
+ 
			attempt_to_merge(renamed, rcf, local, pathname, path, newconf);



		if (sbuf_len(newconf) == 0 && (rcf == NULL || rcf->content == NULL)) {

			pkg_debug(1, "Extracting: %s", archive_entry_pathname(ae));
modified libpkg/pkg_jobs.c
@@ -423,7 +423,7 @@ pkg_jobs_add_req(struct pkg_jobs *j, struct pkg *pkg)
 * reverse - try to upgrade reverse deps as well

 */

static void
- 
pkg_jobs_process_add_request(struct pkg_jobs *j, bool top)
+ 
pkg_jobs_process_add_request(struct pkg_jobs *j)

{

	bool force = j->flags & PKG_FLAG_FORCE,

		 reverse = j->flags & PKG_FLAG_RECURSIVE,
@@ -496,7 +496,7 @@ pkg_jobs_process_add_request(struct pkg_jobs *j, bool top)
				pkg_jobs_add_req_from_universe(&j->request_add, *pun, false, true);

			}

			/* Now recursively process all items checked */
- 
			pkg_jobs_process_add_request(j, false);
+ 
			pkg_jobs_process_add_request(j);

		}

		utarray_free(to_process);

	}
@@ -1506,7 +1506,7 @@ jobs_solve_install_upgrade(struct pkg_jobs *j)
		}

	}
- 
	pkg_jobs_process_add_request(j, true);
+ 
	pkg_jobs_process_add_request(j);

	if (pkg_conflicts_request_resolve(j) != EPKG_OK) {

		pkg_emit_error("Cannot resolve conflicts in a request");

		return (EPKG_FATAL);
modified libpkg/repo/binary/update.c
@@ -356,7 +356,7 @@ pkg_repo_binary_register_conflicts(const char *origin, char **conflicts,


static int

pkg_repo_binary_add_from_manifest(char *buf, sqlite3 *sqlite, size_t len,
- 
		struct pkg_manifest_key **keys, struct pkg **p __unused, bool is_legacy,
+ 
		struct pkg_manifest_key **keys, struct pkg **p __unused,

		struct pkg_repo *repo)

{

	int rc = EPKG_OK;
@@ -441,7 +441,7 @@ pkg_repo_binary_update_proceed(const char *name, struct pkg_repo *repo,
	struct pkg_manifest_key *keys = NULL;

	unsigned char *map = MAP_FAILED;

	size_t len = 0;
- 
	bool in_trans = false, legacy_repo = false;
+ 
	bool in_trans = false;



	pkg_debug(1, "Pkgrepo, begin update of '%s'", name);
@@ -500,7 +500,7 @@ pkg_repo_binary_update_proceed(const char *name, struct pkg_repo *repo,
		if ((cnt % 10 ) == 0)

			pkg_emit_progress_tick(next - map, len);

		rc = pkg_repo_binary_add_from_manifest(walk, sqlite, next - walk,
- 
		    &keys, &pkg, legacy_repo, repo);
+ 
		    &keys, &pkg, repo);

		if (rc != EPKG_OK) {

			pkg_emit_progress_tick(len, len);

			break;