From 21559c8e6692c8afb1aab0b161bdda380a2bb19d Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 8 Nov 2019 14:03:56 -0500 Subject: [PATCH] lib: append error in simple_sink_consume only if error status If the consume_func returns _AGAIN, we will append an error cause. That is wrong because _AGAIN is not an error cause. Check for negative status values instead of just != OK. Change-Id: Ibc03a1e9eb25de5ec39af5148c8e235498c57b64 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/2358 Tested-by: jenkins Reviewed-by: Philippe Proulx --- src/lib/graph/component-class-sink-simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/graph/component-class-sink-simple.c b/src/lib/graph/component-class-sink-simple.c index 8a4aba53..b347280f 100644 --- a/src/lib/graph/component-class-sink-simple.c +++ b/src/lib/graph/component-class-sink-simple.c @@ -178,7 +178,7 @@ enum bt_component_class_sink_consume_method_status simple_sink_consume( /* Call user's "consume" function */ status = data->init_method_data.consume_func(data->msg_iter, data->init_method_data.user_data); - if (status != BT_FUNC_STATUS_OK) { + if (status < 0) { BT_LIB_LOGW_APPEND_CAUSE( "Simple sink component's user's \"consume\" function failed: " "status=%s, %![comp-]+c", -- 2.34.1