32cfcc7 Change name of pkgdb_it_new. — HardenedBSD-pkg

modified libpkg/pkgdb.c

@@ -1321,7 +1321,7 @@ pkgdb_query(struct pkgdb *db, const char *pattern, match_t match)

 	if (match != MATCH_ALL && match != MATCH_CONDITION)
 		sqlite3_bind_text(stmt, 1, pattern, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 }
 struct pkgdb_it *

@@ -1349,7 +1349,7 @@ pkgdb_query_which(struct pkgdb *db, const char *path, bool glob)

 	sqlite3_bind_text(stmt, 1, path, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 }
 struct pkgdb_it *

@@ -1376,7 +1376,7 @@ pkgdb_query_shlib_required(struct pkgdb *db, const char *shlib)

 	sqlite3_bind_text(stmt, 1, shlib, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 }
 struct pkgdb_it *

@@ -1403,7 +1403,7 @@ pkgdb_query_shlib_provided(struct pkgdb *db, const char *shlib)

 	sqlite3_bind_text(stmt, 1, shlib, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 }
 int

@@ -2737,7 +2737,7 @@ pkgdb_search(struct pkgdb *db, const char *pattern, match_t match,

 	sqlite3_bind_text(stmt, 1, pattern, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 }
 int

@@ -2963,7 +2963,7 @@ pkgdb_integrity_conflict_local(struct pkgdb *db, const char *uniqueid)

 	sqlite3_bind_text(stmt, 1, uniqueid, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_INSTALLED, PKGDB_IT_FLAG_ONCE));
 }
 static int

modified libpkg/pkgdb_iterator.c

@@ -819,7 +819,7 @@ populate_pkg(sqlite3_stmt *stmt, struct pkg *pkg) {

 }
 struct pkgdb_it *
 pkgdb_it_new(struct pkgdb *db, sqlite3_stmt *s, int type, short flags)
 pkgdb_it_new_sqlite(struct pkgdb *db, sqlite3_stmt *s, int type, short flags)
 {
 	struct pkgdb_it	*it;

modified libpkg/pkgdb_repo.c

@@ -54,30 +54,6 @@

 #include "private/repodb.h"
 const char *
 pkgdb_get_reponame(struct pkgdb *db, const char *repo)
 {
 	const char	*reponame = NULL;
 	struct pkg_repo	*r;
 	assert(db->type == PKGDB_REMOTE);
 	if (repo != NULL) {
 		if ((r = pkg_repo_find(repo)) == NULL) {
 			pkg_emit_error("repository '%s' does not exist", repo);
 			return (NULL);
 		}
 		reponame = pkg_repo_name(r);
 		if (!pkgdb_is_attached(db->sqlite, reponame)) {
 			pkg_emit_error("repository '%s' does not exist", repo);
 			return (NULL);
 		}
 	}
 	return (reponame);
 }
 struct pkgdb_it *
 pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match,
     const char *repo)

@@ -143,7 +119,7 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match,

 	if (match != MATCH_ALL && match != MATCH_CONDITION)
 		sqlite3_bind_text(stmt, 1, pattern, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 }
 struct pkgdb_it *

@@ -199,7 +175,7 @@ pkgdb_rquery_provide(struct pkgdb *db, const char *provide, const char *repo)

 	sqlite3_bind_text(stmt, 1, provide, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 }
 struct pkgdb_it *

@@ -254,7 +230,7 @@ pkgdb_find_shlib_provide(struct pkgdb *db, const char *require, const char *repo

 	sqlite3_bind_text(stmt, 1, require, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 }
 struct pkgdb_it *

@@ -308,5 +284,5 @@ pkgdb_find_shlib_require(struct pkgdb *db, const char *provide, const char *repo

 	sqlite3_bind_text(stmt, 1, provide, -1, SQLITE_TRANSIENT);
 	return (pkgdb_it_new(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 	return (pkgdb_it_new_sqlite(db, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE));
 }

modified libpkg/private/pkgdb.h

@@ -73,7 +73,7 @@ int pkgdb_transaction_begin(sqlite3 *sqlite, const char *savepoint);

 int pkgdb_transaction_commit(sqlite3 *sqlite, const char *savepoint);
 int pkgdb_transaction_rollback(sqlite3 *sqlite, const char *savepoint);
 struct pkgdb_it *pkgdb_it_new(struct pkgdb *db, sqlite3_stmt *s, int type, short flags);
 struct pkgdb_it *pkgdb_it_new_sqlite(struct pkgdb *db, sqlite3_stmt *s, int type, short flags);
 void pkgshell_open(const char **r);

modified libpkg/repo/binary/update.c

@@ -580,7 +580,7 @@ pkg_repo_binary_update_incremental(const char *name, struct pkg_repo *repo,

 	/* Load local repo data */
 	fakedb.sqlite = sqlite;
 	fakedb.type = PKGDB_REMOTE;
 	it = pkgdb_it_new(&fakedb, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE);
 	it = pkgdb_it_new_sqlite(&fakedb, stmt, PKG_REMOTE, PKGDB_IT_FLAG_ONCE);
 	while (pkgdb_it_next(it, &pkg, PKG_LOAD_BASIC) == EPKG_OK) {
 		pkg_get(pkg, PKG_ORIGIN, &origin, legacy_repo ? PKG_OLD_DIGEST : PKG_DIGEST,