lib: propagate callback return value from xbps_array_foreach_cb_multi

Author: Duncaen

lib/plist.c

@@ -45,6 +45,7 @@ struct thread_data {
 	unsigned int slicecount;
 	int (*fn)(struct xbps_handle *, xbps_object_t, const char *, void *, bool *);
 	void *fn_arg;
+	int r;
 };
 
 /**
@@ -61,7 +62,7 @@ array_foreach_thread(void *arg)
 	xbps_object_t obj, pkgd;
 	struct thread_data *thd = arg;
 	const char *key;
-	int rv;
+	int r;
 	bool loop_done = false;
 	unsigned i = thd->start;
 	unsigned int end = i + thd->slicecount;
@@ -80,9 +81,11 @@ array_foreach_thread(void *arg)
 				pkgd = obj;
 				key = NULL;
 			}
-			rv = (*thd->fn)(thd->xhp, pkgd, key, thd->fn_arg, &loop_done);
-			if (rv != 0 || loop_done)
+			r = (*thd->fn)(thd->xhp, pkgd, key, thd->fn_arg, &loop_done);
+			if (r != 0 || loop_done) {
+				thd->r = r;
 				return NULL;
+			}
 		}
 		/* Reserve more elements to compute */
 		pthread_mutex_lock(thd->reserved_lock);
@@ -171,10 +174,23 @@ xbps_array_foreach_cb_multi(struct xbps_handle *xhp,
 		}
 	}
 
-	free(thd);
 	pthread_mutex_destroy(&reserved_lock);
 
-	return error ? -EIO : 0;
+	if (error != 0) {
+		free(thd);
+		return -EAGAIN;
+	}
+
+	r = 0;
+	for (int j = 0; j < i; j++) {
+		if (thd[i].r == 0)
+			continue;
+		r = thd[i].r;
+		break;
+	}
+
+	free(thd);
+	return r;
 }
 
 int
@@ -187,7 +203,7 @@ xbps_array_foreach_cb(struct xbps_handle *xhp,
 	xbps_dictionary_t pkgd;
 	xbps_object_t obj;
 	const char *key;
-	int rv = 0;
+	int r = 0;
 	bool loop_done = false;
 
 	for (unsigned int i = 0; i < xbps_array_count(array); i++) {
@@ -202,11 +218,11 @@ xbps_array_foreach_cb(struct xbps_handle *xhp,
 			pkgd = obj;
 			key = NULL;
 		}
-		rv = (*fn)(xhp, pkgd, key, arg, &loop_done);
-		if (rv != 0 || loop_done)
-			break;
+		r = (*fn)(xhp, pkgd, key, arg, &loop_done);
+		if (r != 0 || loop_done)
+			return r;
 	}
-	return rv;
+	return 0;
 }
 
 xbps_object_iterator_t