X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fcomponent-class-sink.h;h=003f549f24ee0508e5e35cfdc67d8db6e91666cb;hb=4725a2013cb518374822ccb490610b45f74dbdbf;hp=b57abc94cf713092634490bb8200dd0160b22af0;hpb=b19ff26f04df428047676dd736bd7cc9473906fe;p=babeltrace.git

diff --git a/include/babeltrace/graph/component-class-sink.h b/include/babeltrace/graph/component-class-sink.h
index b57abc94..003f549f 100644
--- a/include/babeltrace/graph/component-class-sink.h
+++ b/include/babeltrace/graph/component-class-sink.h
@@ -26,12 +26,15 @@
 
 #include <stdint.h>
 
-/* For enum bt_self_component_status */
+/* For bt_self_component_status */
 #include <babeltrace/graph/self-component.h>
 
-/* For enum bt_query_status */
+/* For bt_query_status */
 #include <babeltrace/graph/component-class.h>
 
+/* For bt_component_class_status */
+#include <babeltrace/graph/component-class-const.h>
+
 /*
  * For bt_component_class, bt_component_class_sink, bt_port_output,
  * bt_query_executor, bt_self_component_class_sink,
@@ -43,40 +46,33 @@
 extern "C" {
 #endif
 
-typedef enum bt_self_component_status
-(*bt_component_class_sink_init_method)(
+typedef bt_self_component_status (*bt_component_class_sink_init_method)(
 		bt_self_component_sink *self_component,
 		const bt_value *params, void *init_method_data);
 
 typedef void (*bt_component_class_sink_finalize_method)(
 		bt_self_component_sink *self_component);
 
-typedef enum bt_query_status
+typedef bt_query_status
 (*bt_component_class_sink_query_method)(
 		bt_self_component_class_sink *comp_class,
 		const bt_query_executor *query_executor,
 		const char *object, const bt_value *params,
 		const bt_value **result);
 
-typedef enum bt_self_component_status
+typedef bt_self_component_status
 (*bt_component_class_sink_accept_input_port_connection_method)(
 		bt_self_component_sink *self_component,
 		bt_self_component_port_input *self_port,
 		const bt_port_output *other_port);
 
-typedef enum bt_self_component_status
+typedef bt_self_component_status
 (*bt_component_class_sink_input_port_connected_method)(
 		bt_self_component_sink *self_component,
 		bt_self_component_port_input *self_port,
 		const bt_port_output *other_port);
 
-typedef void
-(*bt_component_class_sink_input_port_disconnected_method)(
-		bt_self_component_sink *self_component,
-		bt_self_component_port_input *self_port);
-
-typedef enum bt_self_component_status
-(*bt_component_class_sink_consume_method)(
+typedef bt_self_component_status (*bt_component_class_sink_consume_method)(
 	bt_self_component_sink *self_component);
 
 static inline
@@ -91,27 +87,25 @@ bt_component_class_sink *bt_component_class_sink_create(
 		const char *name,
 		bt_component_class_sink_consume_method method);
 
-extern int bt_component_class_sink_set_init_method(
+extern bt_component_class_status bt_component_class_sink_set_init_method(
 		bt_component_class_sink *comp_class,
 		bt_component_class_sink_init_method method);
 
-extern int bt_component_class_sink_set_finalize_method(
+extern bt_component_class_status bt_component_class_sink_set_finalize_method(
 		bt_component_class_sink *comp_class,
 		bt_component_class_sink_finalize_method method);
 
-extern int bt_component_class_sink_set_accept_input_port_connection_method(
+extern bt_component_class_status
+bt_component_class_sink_set_accept_input_port_connection_method(
 		bt_component_class_sink *comp_class,
 		bt_component_class_sink_accept_input_port_connection_method method);
 
-extern int bt_component_class_sink_set_input_port_connected_method(
+extern bt_component_class_status
+bt_component_class_sink_set_input_port_connected_method(
 		bt_component_class_sink *comp_class,
 		bt_component_class_sink_input_port_connected_method method);
 
-extern int bt_component_class_sink_set_input_port_disconnected_method(
-		bt_component_class_sink *comp_class,
-		bt_component_class_sink_input_port_disconnected_method method);
-
-extern int bt_component_class_sink_set_query_method(
+extern bt_component_class_status bt_component_class_sink_set_query_method(
 		bt_component_class_sink *comp_class,
 		bt_component_class_sink_query_method method);