df7ebf9 Remove unused variables — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Remove unused variables

Baptiste Daroussin committed 10 years ago

commit df7ebf99074265aa2c152b7349493300c2e2a666
parent 24a2471

3 files changed +1 -8

modified libpkg/pkg_manifest.c

@@ -922,7 +922,6 @@ pkg_emit_filelist(struct pkg *pkg, FILE *f)

 pkg_object*
 pkg_emit_object(struct pkg *pkg, short flags)
 {
 	struct pkg_strel	*el;
 	struct pkg_kv		*kv;
 	struct pkg_dep		*dep      = NULL;
 	struct pkg_option	*option   = NULL;

@@ -988,7 +987,6 @@ pkg_emit_object(struct pkg *pkg, short flags)

 	pkg_debug(4, "Emitting licenses");
 	seq = NULL;
 	el = NULL;
 	kh_each_value(pkg->licenses, buf, {
 		if (seq == NULL)
 			seq = ucl_object_typed_new(UCL_ARRAY);

@@ -1022,7 +1020,6 @@ pkg_emit_object(struct pkg *pkg, short flags)

 	pkg_debug(4, "Emitting categories");
 	seq = NULL;
 	el = NULL;
 	kh_each_value(pkg->categories, buf, {
 		if (seq == NULL)
 			seq = ucl_object_typed_new(UCL_ARRAY);

modified libpkg/pkg_ports.c

@@ -233,15 +233,12 @@ pkgdep(struct plist *p, char *line, struct file_attr *a)

 static int
 dir(struct plist *p, char *line, struct file_attr *a)
 {
 	size_t len;
 	char path[MAXPATHLEN];
 	char stagedpath[MAXPATHLEN];
 	char *testpath, *cp;
 	struct stat st;
 	int ret = EPKG_OK;
 	len = strlen(line);
 	cp = line + strlen(line) -1;
 	while (cp > line && isspace(*cp)) {
 		*cp = 0;

modified src/audit.c

@@ -129,7 +129,6 @@ exec_audit(int argc, char **argv)

 	int			 ret = EX_OK;
 	const char		*portaudit_site = NULL;
 	struct sbuf		*sb;
 	const char		*key;
 	kh_pkgs_t		*check = NULL;
 	db_dir = pkg_object_string(pkg_config_get("PKG_DBDIR"));

@@ -273,7 +272,7 @@ exec_audit(int argc, char **argv)

 #endif
 	if (pkg_audit_process(audit) == EPKG_OK) {
 		kh_foreach(check, key, pkg, {
 		kh_foreach_value(check, pkg, {
 			if (pkg_audit_is_vulnerable(audit, pkg, quiet, &sb)) {
 				vuln ++;
 				printf("%s", sbuf_data(sb));