From: Philippe Proulx Date: Fri, 27 Jan 2017 17:43:58 +0000 (-0500) Subject: Rename input.h -> component-input-internal.h X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=262de837eaf8fbd5b2c00a1ffe1aab996c60d783;p=deliverable%2Fbabeltrace.git Rename input.h -> component-input-internal.h Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- diff --git a/include/Makefile.am b/include/Makefile.am index db5c6ffdd..1b53ae2e8 100644 --- 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 5ae007fa4..9bedec53a 100644 --- a/include/babeltrace/component/component-filter-internal.h +++ b/include/babeltrace/component/component-filter-internal.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include 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 index 000000000..4748f31c4 --- /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 + * + * Author: Jérémie Galarneau + * + * 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 +#include +#include + +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 30b066c64..a8e0eb783 100644 --- a/include/babeltrace/component/component-sink-internal.h +++ b/include/babeltrace/component/component-sink-internal.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include struct bt_value; diff --git a/include/babeltrace/component/input.h b/include/babeltrace/component/input.h deleted file mode 100644 index 7bf554212..000000000 --- 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 - * - * Author: Jérémie Galarneau - * - * 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 -#include -#include - -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 f99e5999f..5d983f117 100644 --- a/lib/component/filter.c +++ b/lib/component/filter.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/component/input.c b/lib/component/input.c index 663454b4a..c14156402 100644 --- a/lib/component/input.c +++ b/lib/component/input.c @@ -26,7 +26,7 @@ * SOFTWARE. */ -#include +#include #include BT_HIDDEN