2931715 Mark some unused parameter as such — HardenedBSD-pkg

modified libpkg/pkg_checksum.c

@@ -330,7 +330,7 @@ pkg_checksum_is_valid(const char *cksum, size_t clen)

 /* <hashtype>$<hash> */
 pkg_checksum_type_t
 pkg_checksum_file_get_type(const char *cksum, size_t clen)
 pkg_checksum_file_get_type(const char *cksum, size_t clen __unused)
 {
 	unsigned int value;

@@ -346,7 +346,7 @@ pkg_checksum_file_get_type(const char *cksum, size_t clen)

 /* <version>$<hashtype>$<hash> */
 pkg_checksum_type_t
 pkg_checksum_get_type(const char *cksum, size_t clen)
 pkg_checksum_get_type(const char *cksum, size_t clen __unused)
 {
 	const char *sep;
 	unsigned int value;

modified libpkg/pkg_elf.c

@@ -456,7 +456,7 @@ analyse_fpath(struct pkg *pkg, const char *fpath)

 }
 int
 pkg_analyse_files(struct pkgdb *db, struct pkg *pkg, const char *stage)
 pkg_analyse_files(struct pkgdb *db __unused, struct pkg *pkg, const char *stage)
 {
 	struct pkg_file *file = NULL;
 	char *sh;

modified libpkg/pkg_jobs.c

@@ -2303,7 +2303,7 @@ pkg_jobs_has_lockedpkgs(struct pkg_jobs *j)

 }
 static void
 pkg_jobs_visit_lockedpkgs(const void * node, VISIT v, int __unused0)
 pkg_jobs_visit_lockedpkgs(const void * node, VISIT v, int i __unused)
 {
 	if (v == postorder || v == leaf) {

modified libpkg/pkg_jobs_universe.c

@@ -154,7 +154,7 @@ pkg_jobs_universe_get_remote(struct pkg_jobs_universe *universe,

  */
 int
 pkg_jobs_universe_add_pkg(struct pkg_jobs_universe *universe, struct pkg *pkg,
 		bool force, struct pkg_job_universe_item **found)
 		bool force __unused, struct pkg_job_universe_item **found)
 {
 	struct pkg_job_universe_item *item, *seen, *tmp = NULL;

@@ -372,7 +372,7 @@ pkg_jobs_universe_process_deps(struct pkg_jobs_universe *universe,

 static int
 pkg_jobs_universe_handle_provide(struct pkg_jobs_universe *universe,
 		struct pkgdb_it *it, const char *name, bool is_shlib, struct pkg *parent)
     struct pkgdb_it *it, const char *name, bool is_shlib, struct pkg *parent __unused)
 {
 	struct pkg_job_universe_item *unit;
 	struct pkg_job_provide *pr, *prhead;

modified libpkg/pkg_manifest.c

@@ -602,7 +602,7 @@ pkg_obj(struct pkg *pkg, const ucl_object_t *obj, uint32_t attr)

 }
 static int
 pkg_message(struct pkg *pkg, const ucl_object_t *obj, uint32_t attr)
 pkg_message(struct pkg *pkg, const ucl_object_t *obj, uint32_t attr __unused)
 {
 	return pkg_message_from_ucl(pkg, obj);
 }

modified libpkg/pkg_ports.c

@@ -168,7 +168,7 @@ free_file_attr(struct file_attr *a)

 }
 static int
 setprefix(struct plist *p, char *line, struct file_attr *a)
 setprefix(struct plist *p, char *line, struct file_attr *a __unused)
 {
 	/* if no arguments then set default prefix */
 	if (line[0] == '\0') {

@@ -190,7 +190,7 @@ setprefix(struct plist *p, char *line, struct file_attr *a)

 }
 static int
 name_key(struct plist *p, char *line, struct file_attr *a)
 name_key(struct plist *p, char *line, struct file_attr *a __unused)
 {
 	char *tmp;

@@ -207,7 +207,7 @@ name_key(struct plist *p, char *line, struct file_attr *a)

 }
 static int
 pkgdep(struct plist *p, char *line, struct file_attr *a)
 pkgdep(struct plist *p, char *line, struct file_attr *a __unused)
 {
 	if (*line != '\0') {
 		free(p->pkgdep);

@@ -410,7 +410,7 @@ file(struct plist *p, char *line, struct file_attr *a)

 }
 static int
 setmod(struct plist *p, char *line, struct file_attr *a)
 setmod(struct plist *p, char *line, struct file_attr *a __unused)
 {
 	void *set;

@@ -428,7 +428,7 @@ setmod(struct plist *p, char *line, struct file_attr *a)

 }
 static int
 setowner(struct plist *p, char *line, struct file_attr *a)
 setowner(struct plist *p, char *line, struct file_attr *a __unused)
 {
 	free(p->uname);
 	if (line[0] == '\0')

@@ -439,7 +439,7 @@ setowner(struct plist *p, char *line, struct file_attr *a)

 }
 static int
 setgroup(struct plist *p, char *line, struct file_attr *a)
 setgroup(struct plist *p, char *line, struct file_attr *a __unused)
 {
 	free(p->gname);
 	if (line[0] == '\0')

@@ -450,7 +450,7 @@ setgroup(struct plist *p, char *line, struct file_attr *a)

 }
 static int
 comment_key(struct plist *p, char *line, struct file_attr *a)
 comment_key(struct plist *p, char *line, struct file_attr *a __unused)
 {
 	char *name, *version, *line_options, *line_options2, *option;

@@ -489,7 +489,7 @@ comment_key(struct plist *p, char *line, struct file_attr *a)

 }
 static int
 ignore_next(struct plist *p, __unused char *line, struct file_attr *a)
 ignore_next(struct plist *p, __unused char *line, struct file_attr *a __unused)
 {
 	p->ignore_next = true;
 	if (ctx.developer_mode)

modified libpkg/pkg_solve.c

@@ -891,7 +891,7 @@ err:

 }
 static int
 pkg_solve_picosat_iter(struct pkg_solve_problem *problem, int iter)
 pkg_solve_picosat_iter(struct pkg_solve_problem *problem, int iter __unused)
 {
 	int res, i;
 	struct pkg_solve_variable *var, *cur;

modified tests/lib/pkg_validation.c

@@ -43,7 +43,7 @@ ATF_TC_HEAD(valid_installed, tc)

 }
 int
 event_callback(void *data, struct pkg_event *ev)
 event_callback(void *data __unused, struct pkg_event *ev)
 {
 	switch (ev->type) {
 	case PKG_EVENT_ERROR: