f085c1c Fix indentation and catchup some missed in previous commit — HardenedBSD-pkg

modified libpkg/pkg.c

@@ -347,8 +347,7 @@ pkg_vset(struct pkg *pkg, va_list ap)

 				    ucl_object_fromstring_common(data, strlen(data), 0),
 				    pkg_keys[attr].name, strlen(pkg_keys[attr].name), false);
 				free(buf);
 			free(buf);
 			break;
 		case UCL_BOOLEAN:
 			ucl_object_replace_key(pkg->fields,

modified libpkg/pkg_audit.c

@@ -174,22 +174,18 @@ pkg_audit_free_entry(struct pkg_audit_entry *e)

 	if (!e->ref) {
 		LL_FOREACH_SAFE(e->packages, ppkg, ppkg_tmp) {
 			LL_FOREACH_SAFE(ppkg->versions, vers, vers_tmp) {
 				if (vers->v1.version) {
 					free(vers->v1.version);
 				}
 				if (vers->v2.version) {
 					free(vers->v2.version);
 				}
 				free(vers->v1.version);
 				free(vers->v2.version);
 				free(vers);
 			}
 			LL_FOREACH_SAFE(ppkg->names, pname, pname_tmp) {
 					free(pname->pkgname);
 				free(pname->pkgname);
 				free(pname);
 			}
 		}
 		LL_FOREACH_SAFE(e->cve, cve, cve_tmp) {
 				free(cve->cvename);
 			free(cve->cvename);
 			free(cve);
 		}
 			free(e->url);

modified libpkg/pkg_cudf.c

@@ -518,7 +518,7 @@ pkg_jobs_cudf_parse_output(struct pkg_jobs *j, FILE *f)

 		}
 	}
 		free(line);
 	free(line);
 	return (EPKG_OK);
 }

modified libpkg/pkg_jobs.c

@@ -120,9 +120,8 @@ pkg_jobs_destdir(struct pkg_jobs *j)

 static void
 pkg_jobs_pattern_free(struct job_pattern *jp)
 {
 		free(jp->pattern);
 		free(jp->path);
 	free(jp->pattern);
 	free(jp->path);
 	free(jp);
 }

@@ -657,7 +656,7 @@ pkg_jobs_try_remote_candidate(struct pkg_jobs *j, const char *pattern,

 	}
 		pkg_free(p);
 	pkg_free(p);
 	sbuf_free(qmsg);
 	pkgdb_it_free(it);

modified libpkg/pkg_ports.c

@@ -267,9 +267,7 @@ static int

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

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

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

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

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

@@ -1124,9 +1122,9 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage)

 	HASH_FREE(pplist.keywords, keyword_free);
 		free(pplist.pkgdep);
 		free(pplist.uname);
 		free(pplist.gname);
 	free(pplist.pkgdep);
 	free(pplist.uname);
 	free(pplist.gname);
 	free(pplist.post_patterns.buf);
 	free(pplist.post_patterns.patterns);

modified libpkg/pkg_repo.c

@@ -606,7 +606,7 @@ pkg_repo_archive_extract_archive(int fd, const char *file,

 		cbdata.need_sig = false;
 		if (pkg_emit_sandbox_get_string(pkg_repo_meta_extract_signature_pubkey,
 			&cbdata, (char **)&sig, &siglen) == EPKG_OK) {
 				free(sig);
 			free(sig);
 		}
 		else {
 			pkg_emit_error("Repo extraction failed");

modified libpkg/pkg_repo_create.c

@@ -417,7 +417,7 @@ cleanup:

 	close(mfd);
 	if (read_files)
 		close(ffd);
 		free(mdigest);
 	free(mdigest);
 	pkg_debug(1, "worker done");
 	exit(ret);

@@ -1093,7 +1093,7 @@ cleanup:

 	pkg_emit_progress_tick(files_to_pack, files_to_pack);
 	pkg_repo_meta_free(meta);
 		rsa_free(rsa);
 	rsa_free(rsa);
 	return (ret);
 }

modified libpkg/pkg_solve.c

@@ -932,6 +932,7 @@ pkg_solve_parse_sat_output(FILE *f, struct pkg_solve_problem *problem, struct pk

 	}
 	HASH_FREE(ordered_variables, free);
 		free(line);
 	free(line);
 	return (ret);
 }

modified libpkg/repo/binary/update.c

@@ -527,7 +527,7 @@ pkg_repo_binary_parse_conflicts(FILE *f, sqlite3 *sqlite)

 		free(deps);
 	}
 		free(linebuf);
 	free(linebuf);
 }
 sqlite3_stmt *

modified src/annotate.c

@@ -382,8 +382,8 @@ exec_annotate(int argc, char **argv)

 	}
 cleanup:
 		pkg_free(pkg);
 		pkgdb_it_free(it);
 	pkg_free(pkg);
 	pkgdb_it_free(it);
 	pkgdb_release_lock(db, PKGDB_LOCK_EXCLUSIVE);
 	pkgdb_close(db);

modified src/check.c

@@ -186,7 +186,7 @@ fix_deps(struct pkgdb *db, struct deps_head *dh, int nbpkgs, bool yes)

 	}
 cleanup:
 		free(pkgs);
 	free(pkgs);
 	if (jobs != NULL)
 		pkg_jobs_free(jobs);

modified src/event.c

@@ -354,7 +354,8 @@ void

 progressbar_start(const char *pmsg)
 {
 	free(progress_message);
 		progress_message = NULL;
 	progress_message = NULL;
 	if (quiet)
 		return;
 	if (pmsg != NULL)

modified src/info.c

@@ -514,7 +514,7 @@ exec_info(int argc, char **argv)

 	} while (i < argc);
 cleanup:
 		pkg_free(pkg);
 	pkg_free(pkg);
 	pkgdb_release_lock(db, PKGDB_LOCK_READONLY);
 	pkgdb_close(db);

modified src/lock.c

@@ -245,8 +245,8 @@ exec_lock_unlock(int argc, char **argv, enum action action)

 		exitcode = EX_IOERR;
 cleanup:
 		pkg_free(pkg);
 		pkgdb_it_free(it);
 	pkg_free(pkg);
 	pkgdb_it_free(it);
 	pkgdb_release_lock(db, PKGDB_LOCK_EXCLUSIVE);
 	pkgdb_close(db);

modified src/query.c

@@ -998,7 +998,7 @@ exec_query(int argc, char **argv)

 	}
 cleanup:
 		pkg_free(pkg);
 	pkg_free(pkg);
 	pkgdb_release_lock(db, PKGDB_LOCK_READONLY);
 	pkgdb_close(db);

modified src/set.c

@@ -128,7 +128,7 @@ exec_set(int argc, char **argv)

 			yes = true;
 			break;
 		default:
 				free(oldorigin);
 			free(oldorigin);
 			usage_set();
 			return (EX_USAGE);

@@ -249,9 +249,8 @@ exec_set(int argc, char **argv)

 	} while (i < argc);
 cleanup:
 		free(oldorigin);
 		pkg_free(pkg);
 	free(oldorigin);
 	pkg_free(pkg);
 	pkgdb_release_lock(db, PKGDB_LOCK_EXCLUSIVE);
 	pkgdb_close(db);