Rename input.h -> component-input-internal.h

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index db5c6ffdd35b1cd21fce4e9ba8c73fffab7804f8..1b53ae2e8700b6e6c1cdff0d9a7543a49f795e9f 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -128,7 +128,7 @@ noinst_HEADERS = \
        babeltrace/component/component-filter-internal.h \
        babeltrace/component/component-sink-internal.h \
        babeltrace/component/component-source-internal.h \
-       babeltrace/component/input.h \
+       babeltrace/component/component-input-internal.h \
        babeltrace/component/notification/eot-internal.h \
        babeltrace/component/notification/event-internal.h \
        babeltrace/component/notification/iterator-internal.h \

diff --git a/include/babeltrace/component/component-filter-internal.h b/include/babeltrace/component/component-filter-internal.h
index 5ae007fa477c177d794dc4ab0f4a926fce53fef5..9bedec53aab57d4fe48dbb781f9b9c1b34cbbb96 100644 (file)
--- a/include/babeltrace/component/component-filter-internal.h
+++ b/include/babeltrace/component/component-filter-internal.h
@@ -30,7 +30,7 @@
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/component/component-internal.h>
 #include <babeltrace/component/component-class-internal.h>
-#include <babeltrace/component/input.h>
+#include <babeltrace/component/component-input-internal.h>
 
 struct bt_value;
 

diff --git a/include/babeltrace/component/component-input-internal.h b/include/babeltrace/component/component-input-internal.h
new file mode 100644 (file)
index 0000000..4748f31
--- /dev/null
+++ b/include/babeltrace/component/component-input-internal.h
@@ -0,0 +1,51 @@
+#ifndef BABELTRACE_COMPONENT_COMPONENT_INPUT_INTERNAL_H
+#define BABELTRACE_COMPONENT_COMPONENT_INPUT_INTERNAL_H
+
+/*
+ * BabelTrace - Component Input
+ *
+ * Copyright 2016 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
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/babeltrace-internal.h>
+#include <glib.h>
+#include <stdbool.h>
+
+struct component_input {
+       /* Array of struct bt_notification_iterator pointers. */
+       GPtrArray *iterators;
+       unsigned int min_count;
+       unsigned int max_count;
+       bool validated;
+};
+
+BT_HIDDEN
+int component_input_init(struct component_input *input);
+
+BT_HIDDEN
+int component_input_validate(struct component_input *input);
+
+BT_HIDDEN
+void component_input_fini(struct component_input *input);
+
+#endif /* BABELTRACE_COMPONENT_COMPONENT_INPUT_INTERNAL_H */

diff --git a/include/babeltrace/component/component-sink-internal.h b/include/babeltrace/component/component-sink-internal.h
index 30b066c646aba6a8d530d22b830805af66245402..a8e0eb783127c78a1ecd6acf1b31f72ab805ae0f 100644 (file)
--- a/include/babeltrace/component/component-sink-internal.h
+++ b/include/babeltrace/component/component-sink-internal.h
@@ -30,7 +30,7 @@
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/component/component-internal.h>
 #include <babeltrace/component/component-class-internal.h>
-#include <babeltrace/component/input.h>
+#include <babeltrace/component/component-input-internal.h>
 
 struct bt_value;
 

diff --git a/include/babeltrace/component/input.h b/include/babeltrace/component/input.h
deleted file mode 100644 (file)
index 7bf5542..0000000
--- a/include/babeltrace/component/input.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef BABELTRACE_COMPONENT_INPUT_INTERNAL_H
-#define BABELTRACE_COMPONENT_INPUT_INTERNAL_H
-
-/*
- * BabelTrace - Component Input
- *
- * Copyright 2016 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
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <glib.h>
-#include <stdbool.h>
-
-struct component_input {
-       /* Array of struct bt_notification_iterator pointers. */
-       GPtrArray *iterators;
-       unsigned int min_count;
-       unsigned int max_count;
-       bool validated;
-};
-
-BT_HIDDEN
-int component_input_init(struct component_input *input);
-
-BT_HIDDEN
-int component_input_validate(struct component_input *input);
-
-BT_HIDDEN
-void component_input_fini(struct component_input *input);
-
-#endif /* BABELTRACE_COMPONENT_INPUT_INTERNAL_H */

diff --git a/lib/component/filter.c b/lib/component/filter.c
index f99e5999f5928348291c05d136e41e686a84d04c..5d983f11724babadbd21db90098d7bb373913722 100644 (file)
--- a/lib/component/filter.c
+++ b/lib/component/filter.c
@@ -28,7 +28,7 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/values.h>
-#include <babeltrace/component/input.h>
+#include <babeltrace/component/component-input-internal.h>
 #include <babeltrace/component/component-filter-internal.h>
 #include <babeltrace/component/component-internal.h>
 #include <babeltrace/component/component-class-internal.h>

diff --git a/lib/component/input.c b/lib/component/input.c
index 663454b4adb345604aa8778e2809eba87edd6cf1..c14156402b17d920c717975acb3e157a04288237 100644 (file)
--- a/lib/component/input.c
+++ b/lib/component/input.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/component/input.h>
+#include <babeltrace/component/component-input-internal.h>
 #include <babeltrace/ref.h>
 
 BT_HIDDEN