lib: strictly type function return status enumerations

[babeltrace.git] / src / lib / graph / component.h

diff --git a/src/lib/graph/component.h b/src/lib/graph/component.h
index 2155d5da203ca6bcbf5acb0edee384c440dae7fa..c993ce6914df7a01c72f6a74d4553b43d30dea6c 100644 (file)
--- a/src/lib/graph/component.h
+++ b/src/lib/graph/component.h
@@ -26,6 +26,7 @@
 
 #include "common/macros.h"
 #include <babeltrace2/graph/component-const.h>
+#include <babeltrace2/graph/component-class.h>
 #include "lib/object.h"
 #include <babeltrace2/types.h>
 #include <babeltrace2/logging.h>
@@ -84,12 +85,8 @@ int bt_component_create(struct bt_component_class *component_class,
                struct bt_component **component);
 
 BT_HIDDEN
-enum bt_self_component_status bt_component_accept_port_connection(
-               struct bt_component *component, struct bt_port *self_port,
-               struct bt_port *other_port);
-
-BT_HIDDEN
-enum bt_self_component_status bt_component_port_connected(
+enum bt_component_class_port_connected_method_status
+bt_component_port_connected(
                struct bt_component *comp,
                struct bt_port *self_port, struct bt_port *other_port);
 
@@ -120,12 +117,12 @@ struct bt_port_output *bt_component_borrow_output_port_by_name(
                struct bt_component *comp, const char *name);
 
 BT_HIDDEN
-enum bt_self_component_status bt_component_add_input_port(
+enum bt_self_component_add_port_status bt_component_add_input_port(
                struct bt_component *component, const char *name,
                void *user_data, struct bt_port **port);
 
 BT_HIDDEN
-enum bt_self_component_status bt_component_add_output_port(
+enum bt_self_component_add_port_status bt_component_add_output_port(
                struct bt_component *component, const char *name,
                void *user_data, struct bt_port **port);
 
@@ -141,26 +138,4 @@ BT_HIDDEN
 void bt_component_remove_destroy_listener(struct bt_component *component,
                bt_component_destroy_listener_func func, void *data);
 
-static inline
-const char *bt_self_component_status_string(
-               enum bt_self_component_status status)
-{
-       switch (status) {
-       case BT_SELF_COMPONENT_STATUS_OK:
-               return "BT_SELF_COMPONENT_STATUS_OK";
-       case BT_SELF_COMPONENT_STATUS_END:
-               return "BT_SELF_COMPONENT_STATUS_END";
-       case BT_SELF_COMPONENT_STATUS_AGAIN:
-               return "BT_SELF_COMPONENT_STATUS_AGAIN";
-       case BT_SELF_COMPONENT_STATUS_REFUSE_PORT_CONNECTION:
-               return "BT_SELF_COMPONENT_STATUS_REFUSE_PORT_CONNECTION";
-       case BT_SELF_COMPONENT_STATUS_ERROR:
-               return "BT_SELF_COMPONENT_STATUS_ERROR";
-       case BT_SELF_COMPONENT_STATUS_NOMEM:
-               return "BT_SELF_COMPONENT_STATUS_NOMEM";
-       default:
-               return "(unknown)";
-       }
-}
-
 #endif /* BABELTRACE_GRAPH_COMPONENT_INTERNAL_H */