Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d2be71a
Small fixes
Alexandre Perrin committed 11 years ago
commit d2be71aeac4c0c9420e41b83fb8d6e332b3d30ef
parent 7349434
2 files changed +3 -6
modified libpkg/pkg_add.c
@@ -143,8 +143,8 @@ do_extract(struct archive *a, struct archive_entry *ae, const char *location,
	char	path[MAXPATHLEN], pathname[MAXPATHLEN], rpath[MAXPATHLEN];

	struct stat st;

	bool renamed = false;
- 
	const struct pkg_file *lf, *rf;
- 
	struct pkg_config_file *lcf, *rcf;
+ 
	const struct pkg_file *rf;
+ 
	struct pkg_config_file *rcf;

	struct sbuf *newconf;

	bool automerge = pkg_object_bool(pkg_config_get("AUTOMERGE"));
@@ -163,9 +163,7 @@ do_extract(struct archive *a, struct archive_entry *ae, const char *location,
	do {

		ret = ARCHIVE_OK;

		sbuf_clear(newconf);
- 
		lf = NULL;

		rf = NULL;
- 
		lcf = NULL;

		rcf = NULL;

		pkg_absolutepath(archive_entry_pathname(ae), path, sizeof(path));

		snprintf(pathname, sizeof(pathname), "%s/%s",
modified libpkg/pkgdb_iterator.c
@@ -901,8 +901,7 @@ pkgdb_sqlite_it_next(struct pkgdb_sqlite_it *it,


	switch (sqlite3_step(it->stmt)) {

	case SQLITE_ROW:
- 
		if (*pkg_p != NULL)
- 
			pkg_free(*pkg_p);
+ 
		pkg_free(*pkg_p);

		ret = pkg_new(pkg_p, it->pkg_type);

		if (ret != EPKG_OK)

			return (ret);