lib: strictly type function return status enumerations

[babeltrace.git] / tests / lib / test-plugin-plugins / sfs.c

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index b548750429c2506def5e75aefa36658b0a90b7ff..6e0e0a4b0ba1b65433db6bab93977ffe708e0b85 100644 (file)
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -15,29 +15,31 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include "common/assert.h"
 
-static enum bt_self_component_status sink_consume(
+static bt_component_class_sink_consume_method_status sink_consume(
                bt_self_component_sink *self_comp)
 {
-       return BT_SELF_COMPONENT_STATUS_OK;
+       return BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_OK;
 }
 
-static enum bt_self_message_iterator_status src_dummy_iterator_init_method(
+static bt_component_class_message_iterator_init_method_status
+src_dummy_iterator_init_method(
                bt_self_message_iterator *self_msg_iter,
                bt_self_component_source *self_comp,
                bt_self_component_port_output *self_port)
 {
-       return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+       return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
 }
 
-static enum bt_self_message_iterator_status flt_dummy_iterator_init_method(
+static bt_component_class_message_iterator_init_method_status
+flt_dummy_iterator_init_method(
                bt_self_message_iterator *self_msg_iter,
                bt_self_component_filter *self_comp,
                bt_self_component_port_output *self_port)
 {
-       return BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+       return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
 }
 
 static void dummy_iterator_finalize_method(
@@ -45,18 +47,20 @@ static void dummy_iterator_finalize_method(
 {
 }
 
-static enum bt_self_message_iterator_status dummy_iterator_next_method(
+static bt_component_class_message_iterator_next_method_status
+dummy_iterator_next_method(
                bt_self_message_iterator *self_msg_iter,
                bt_message_array_const msgs, uint64_t capacity,
                uint64_t *count)
 {
-       return BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+       return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
 }
 
-static enum bt_query_status flt_query_method(
+static bt_component_class_query_method_status flt_query_method(
                bt_self_component_class_filter *component_class,
                const bt_query_executor *query_exec,
                const char *object, const bt_value *params,
+               __attribute__((unused)) bt_logging_level log_level,
                const bt_value **result)
 {
        bt_value *res = bt_value_array_create();
@@ -72,7 +76,7 @@ static enum bt_query_status flt_query_method(
        iret = bt_value_array_append_element(res, val);
        BT_ASSERT(iret == 0);
        bt_value_put_ref(val);
-       return BT_QUERY_STATUS_OK;
+       return BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_OK;
 }
 
 BT_PLUGIN_MODULE();