fixup! lib: better error reporting for xbps_array_foreach_cb_multi

Author: Duncaen

lib/pkgdb.c

@@ -380,16 +380,17 @@ xbps_pkgdb_foreach_cb(struct xbps_handle *xhp,
 		void *arg)
 {
 	xbps_array_t allkeys;
-	int rv;
+	int r;
 
-	if ((rv = xbps_pkgdb_init(xhp)) != 0)
-		return rv;
+	// XXX: this should be done before calling the function...
+	if ((r = xbps_pkgdb_init(xhp)) != 0)
+		return r > 0 ? -r : r;
 
 	allkeys = xbps_dictionary_all_keys(xhp->pkgdb);
 	assert(allkeys);
-	rv = xbps_array_foreach_cb(xhp, allkeys, xhp->pkgdb, fn, arg);
+	r = xbps_array_foreach_cb(xhp, allkeys, xhp->pkgdb, fn, arg);
 	xbps_object_release(allkeys);
-	return rv;
+	return r;
 }
 
 int
@@ -400,7 +401,9 @@ xbps_pkgdb_foreach_cb_multi(struct xbps_handle *xhp,
 	xbps_array_t allkeys;
 	int r;
 
-	assert(xhp->pkgdb);
+	// XXX: this should be done before calling the function...
+	if ((r = xbps_pkgdb_init(xhp)) != 0)
+		return r > 0 ? -r : r;
 
 	allkeys = xbps_dictionary_all_keys(xhp->pkgdb);
 	if (!allkeys)