X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fargpar-utils%2Fargpar-utils.c;fp=src%2Fcommon%2Fargpar-utils%2Fargpar-utils.c;h=493598693632ec32556a0260488a7d16662c8a84;hp=af3e76102c57fe0d17421f448beaf7091bbede82;hb=ef9ff9cb5ff4dd763d4c9dbbcfcb5952adce167e;hpb=e776cf47dcf2cd7ab154392f30eb015f6a6f2866

diff --git a/src/common/argpar-utils/argpar-utils.c b/src/common/argpar-utils/argpar-utils.c
index af3e76102..493598693 100644
--- a/src/common/argpar-utils/argpar-utils.c
+++ b/src/common/argpar-utils/argpar-utils.c
@@ -120,6 +120,7 @@ end:
 enum parse_next_item_status parse_next_item(struct argpar_iter *iter,
 		const struct argpar_item **item, int argc_offset,
 		const char **argv, bool unknown_opt_is_error,
+		const struct argpar_error **error_out,
 		const char *context_fmt, ...)
 {
 	enum argpar_iter_next_status status;
@@ -132,7 +133,7 @@ enum parse_next_item_status parse_next_item(struct argpar_iter *iter,
 	switch (status) {
 	case ARGPAR_ITER_NEXT_STATUS_ERROR_MEMORY:
 		ERR("Failed to get next argpar item.");
-		ret = PARSE_NEXT_ITEM_STATUS_ERROR;
+		ret = PARSE_NEXT_ITEM_STATUS_ERROR_MEMORY;
 		break;
 	case ARGPAR_ITER_NEXT_STATUS_ERROR:
 	{
@@ -170,6 +171,12 @@ enum parse_next_item_status parse_next_item(struct argpar_iter *iter,
 		abort();
 	}
 
+	if (error_out) {
+		argpar_error_destroy(*error_out);
+		*error_out = error;
+		error = NULL;
+	}
+
 	argpar_error_destroy(error);
 
 	return ret;