Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 88c353b
libpkg: Remove an unused/shadowed local variable in pkgdb_it_next()
Mark Johnston committed 7 months ago
commit 88c353b6869960e0b4c398bef672c81f8ab6cdce
parent 7bd7670
1 file changed +11 -9
modified libpkg/pkgdb_iterator.c
@@ -1095,24 +1095,26 @@ pkgdb_sqlite_it_next(struct pkgdb_sqlite_it *it,
int

pkgdb_it_next(struct pkgdb_it *it, struct pkg **pkg_p, unsigned flags)

{
- 
	struct pkg_repo_it *rit;
- 
	int ret = EPKG_END;
- 


	assert(it != NULL);



	if (it->local != NULL && !it->local->finished) {
- 
		int r = pkgdb_sqlite_it_next(it->local, pkg_p, flags);
- 
		if ( r != EPKG_END)
- 
			return (r);
+ 
		int ret;
+
+ 
		ret = pkgdb_sqlite_it_next(it->local, pkg_p, flags);
+ 
		if (ret != EPKG_END)
+ 
			return (ret);

	}



	if (vec_len(&it->remote) != 0) {
+ 
		struct pkg_repo_it *rit;
+ 
		int ret;
+ 


		if (it->remote_pos >= it->remote.len)

			it->remote_pos = 0;
- 
		struct pkg_repo_it *rit = it->remote.d[it->remote_pos];
+ 
		rit = it->remote.d[it->remote_pos];

		ret = rit->ops->next(rit, pkg_p, flags);

		if (ret != EPKG_OK) {
- 
			if (it->remote_pos == it->remote.len -1 )
+ 
			if (it->remote_pos == it->remote.len - 1)

				return (EPKG_END);

			it->remote_pos++;

			return (pkgdb_it_next(it, pkg_p, flags));
@@ -1124,7 +1126,7 @@ pkgdb_it_next(struct pkgdb_it *it, struct pkg **pkg_p, unsigned flags)
		return (EPKG_OK);

	}
- 
	return ret;
+ 
	return (EPKG_END);

}



// TODO: Why doesn't this function handle remote?