Move initialization of components to init functions

[babeltrace.git] / include / babeltrace / plugin / component-internal.h

diff --git a/include/babeltrace/plugin/component-internal.h b/include/babeltrace/plugin/component-internal.h
index 6c8689aaabd5cd2dfd781bd2bdac35b3f31bd439..7f35eaf55af99a5f918aca8e8c72a255bfd7a07b 100644 (file)
--- a/include/babeltrace/plugin/component-internal.h
+++ b/include/babeltrace/plugin/component-internal.h
@@ -28,40 +28,28 @@
  */
 
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/plugin.h>
-#include <babeltrace/plugin/component.h>
 #include <babeltrace/plugin/plugin-system.h>
+#include <babeltrace/plugin/component.h>
 #include <babeltrace/ctf-writer/ref-internal.h>
 #include <glib.h>
 #include <stdio.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_notification;
-
 struct bt_component {
        struct bt_ctf_ref ref_count;
        GString *name;
        enum bt_component_type type;
        /** No ownership taken */
        FILE *error_stream;
+       /** source, sink or filter destroy */
+       bt_component_destroy_cb destroy;
 
        void *user_data;
-       bt_component_destroy_cb user_data_destroy;
-       bt_component_destroy_cb destroy;
+       bt_component_destroy_cb user_destroy;
 };
 
 BT_HIDDEN
-enum bt_component_status bt_component_init(struct bt_component *plugin,
-               const char *name, void *user_data,
-               bt_component_destroy_cb destroy_func,
-               enum bt_component_type component_type,
-               bt_component_destroy_cb component_destroy);
-
-#ifdef __cplusplus
-}
-#endif
+enum bt_component_status bt_component_init(struct bt_component *component,
+               const char *name, enum bt_component_type component_type,
+               bt_component_destroy_cb destroy);
 
 #endif /* BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H */