61fb9e7 Remove dead code — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Remove dead code

Baptiste Daroussin committed 5 years ago

commit 61fb9e70ec36523dc3827c2fa96626a3fb410d85
parent 3e8b322

2 files changed +0 -36

modified libpkg/pkgdb.c

@@ -2533,41 +2533,6 @@ get_pragma(sqlite3 *s, const char *sql, int64_t *res, bool silence)

 }
 int
 get_sql_string(sqlite3 *s, const char *sql, char **res)
 {
 	sqlite3_stmt	*stmt;
 	int		 ret;
 	assert(s != NULL && sql != NULL);
 	pkg_debug(4, "Pkgdb: running '%s'", sql);
 	if (sqlite3_prepare_v2(s, sql, -1, &stmt, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(s, sql);
 		return (EPKG_OK);
 	}
 	ret = sqlite3_step(stmt);
 	if (ret == SQLITE_ROW) {
 		const unsigned char *tmp;
 		tmp = sqlite3_column_text(stmt, 0);
 		*res = (tmp == NULL ? NULL : xstrdup(tmp));
 	}
 	if (ret == SQLITE_DONE)
 		*res = NULL;
 	sqlite3_finalize(stmt);
 	if (ret != SQLITE_ROW && ret != SQLITE_DONE) {
 		ERROR_SQLITE(s, sql);
 		return (EPKG_FATAL);
 	}
 	return (EPKG_OK);
 }
 int
 pkgdb_compact(struct pkgdb *db)
 {
 	int64_t	page_count = 0;

modified libpkg/private/pkg.h

@@ -769,7 +769,6 @@ int pkg_delete_dirs(struct pkgdb *db, struct pkg *pkg, struct pkg *p);

 /* pkgdb commands */
 int sql_exec(sqlite3 *, const char *, ...);
 int get_pragma(sqlite3 *, const char *sql, int64_t *res, bool silence);
 int get_sql_string(sqlite3 *, const char *sql, char **res);
 int pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int forced, const char *);
 int pkgdb_update_shlibs_required(struct pkg *pkg, int64_t package_id, sqlite3 *s);