lib: Reset libbabeltrace2 to SONANE 0

[babeltrace.git] / include / babeltrace / graph / port-internal.h

diff --git a/include/babeltrace/graph/port-internal.h b/include/babeltrace/graph/port-internal.h
index f4d4c0367b3b20b306e32bcd2eb2e95ebd9147c1..7b0d819caceb176de9ece14400ffd12a5624858e 100644 (file)
--- a/include/babeltrace/graph/port-internal.h
+++ b/include/babeltrace/graph/port-internal.h
@@ -1,13 +1,10 @@
-#ifndef BABELTRACE_COMPONENT_PORT_INTERNAL_H
-#define BABELTRACE_COMPONENT_PORT_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_PORT_INTERNAL_H
+#define BABELTRACE_GRAPH_PORT_INTERNAL_H
 
 /*
- * BabelTrace - Babeltrace Component Port
- *
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -27,7 +24,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/graph/port.h>
+#include <babeltrace/graph/port-const.h>
 
 struct bt_port {
        struct bt_object base;
@@ -37,19 +34,7 @@ struct bt_port {
        void *user_data;
 };
 
-static inline
-struct bt_port *bt_port_borrow_from_private(
-               struct bt_private_port *private_port)
-{
-       return (void *) private_port;
-}
-
-static inline
-struct bt_private_port *bt_private_port_from_port(
-               struct bt_port *port)
-{
-       return (void *) port;
-}
+struct bt_component;
 
 BT_HIDDEN
 struct bt_port *bt_port_create(struct bt_component *parent_component,
@@ -59,6 +44,13 @@ BT_HIDDEN
 void bt_port_set_connection(struct bt_port *port,
                struct bt_connection *connection);
 
+static inline
+struct bt_component *bt_port_borrow_component_inline(const struct bt_port *port)
+{
+       BT_ASSERT(port);
+       return (void *) bt_object_borrow_parent(&port->base);
+}
+
 static inline
 const char *bt_port_type_string(enum bt_port_type port_type)
 {
@@ -67,11 +59,9 @@ const char *bt_port_type_string(enum bt_port_type port_type)
                return "BT_PORT_TYPE_INPUT";
        case BT_PORT_TYPE_OUTPUT:
                return "BT_PORT_TYPE_OUTPUT";
-       case BT_PORT_TYPE_UNKOWN:
-               return "BT_PORT_TYPE_UNKOWN";
        default:
                return "(unknown)";
        }
 }
 
-#endif /* BABELTRACE_COMPONENT_PORT_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_PORT_INTERNAL_H */