cd7114a Fix warnings, fix some memleaks. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix warnings, fix some memleaks.

jlaffaye committed 15 years ago

commit cd7114a3b775d4f9321ecbce52c9202d27fee43a
parent 96570f9

4 files changed +6 -3

modified libpkg/pkg.c

@@ -76,6 +76,7 @@ pkg_resolvdeps(struct pkg *pkg, struct pkgdb *db) {

 		} else {
 			deps[i]->type = PKG_NOTFOUND;
 		}
 		pkgdb_it_free(it);
 	}
 	return (0);

modified libpkg/util.c

@@ -162,12 +162,12 @@ split_chr(char *str, char sep)

 }
 int
 file_fetch(const char *url, char *dest)
 file_fetch(const char *url, const char *dest)
 {
 	int fd;
 	FILE *remote = NULL;
 	struct url_stat st;
 	size_t tfetched, rfetched, wfetched;
 	off_t tfetched, rfetched, wfetched;
 	int retry = 3;
 	time_t begin_dl, now;
 	char buf[BUFSIZ], sz[8];

modified libpkg/util.h

@@ -21,6 +21,6 @@ off_t file_to_buffer(const char *path, char **buffer);

 char *str_replace(char *string, const char *find, char *replace);
 int select_dir(const struct dirent *);
 int split_chr(char *, char);
 int file_fetch(const char *, char *);
 int file_fetch(const char *, const char *);
 #endif

modified pkg/add.c

@@ -49,6 +49,7 @@ exec_add(int argc, char **argv)

 	if (pkgdb_it_next_pkg(it, &p, PKG_BASIC) == 0) {
 		installed = true;
 	}
 	pkgdb_it_free(it);
 	if (installed) {

@@ -71,6 +72,7 @@ exec_add(int argc, char **argv)

 	if (ret != 0)
 		return (ret);
 	pkgdb_close(db);
 	return (0);
 }