From: Simon Marchi <simon.marchi@efficios.com>
Date: Mon, 1 Apr 2019 16:17:43 +0000 (-0400)
Subject: Small fixes to include/
X-Git-Url: http://git.efficios.com/?p=deliverable%2Fbabeltrace.git;a=commitdiff_plain;h=532d0c1b5a2816a45969f4aef72f60b4971fba0b

Small fixes to include/

* Function bt_component_filter_borrow_from_self is declared, but does not
  actually exist.

* Parameters to bt_self_component_{get,set}_data are named "private",
  which is the old naming scheme.  Change that to self.

* bt_component_graph is typedef'ed to struct bt_component_graph, which
  doesn't actually exist.  struct bt_graph exists, and there's already a
  typedef for it.
---

diff --git a/include/babeltrace/graph/self-component-filter.h b/include/babeltrace/graph/self-component-filter.h
index 36ac696cd..8d12e106e 100644
--- a/include/babeltrace/graph/self-component-filter.h
+++ b/include/babeltrace/graph/self-component-filter.h
@@ -54,9 +54,6 @@ bt_self_component_filter_as_component_filter(
 	return (const void *) self_comp_filter;
 }
 
-extern bt_component_filter *bt_component_filter_borrow_from_self(
-		bt_self_component_filter *self_component);
-
 extern bt_self_component_port_output *
 bt_self_component_filter_borrow_output_port_by_name(
 		bt_self_component_filter *self_component,
diff --git a/include/babeltrace/graph/self-component.h b/include/babeltrace/graph/self-component.h
index c11d8e456..65ff2e67d 100644
--- a/include/babeltrace/graph/self-component.h
+++ b/include/babeltrace/graph/self-component.h
@@ -47,10 +47,10 @@ const bt_component *bt_self_component_as_component(
 }
 
 extern void *bt_self_component_get_data(
-		const bt_self_component *private_component);
+		const bt_self_component *self_component);
 
 extern void bt_self_component_set_data(
-		bt_self_component *private_component, void *data);
+		bt_self_component *self_component, void *data);
 
 #ifdef __cplusplus
 }
diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index 1805431c1..d8d9d311a 100644
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -84,7 +84,6 @@ typedef struct bt_component_class_filter bt_component_class_filter;
 typedef struct bt_component_class_sink bt_component_class_sink;
 typedef struct bt_component_class_source bt_component_class_source;
 typedef struct bt_component_filter bt_component_filter;
-typedef struct bt_component_graph bt_component_graph;
 typedef struct bt_component_sink bt_component_sink;
 typedef struct bt_component_source bt_component_source;
 typedef struct bt_connection bt_connection;