From d71dcf2c09c27291afa19a40eb99cc3556842e99 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 26 Jan 2017 04:11:30 -0500 Subject: [PATCH] Prefix {source,filter,sink}*.h file names with component- MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- converter/babeltrace.c | 6 +++--- include/Makefile.am | 12 ++++++------ ...filter-internal.h => component-filter-internal.h} | 0 .../component/{filter.h => component-filter.h} | 0 .../{sink-internal.h => component-sink-internal.h} | 0 .../component/{sink.h => component-sink.h} | 0 ...source-internal.h => component-source-internal.h} | 0 .../component/{source.h => component-source.h} | 0 lib/component/component.c | 6 +++--- lib/component/filter.c | 2 +- lib/component/iterator.c | 2 +- lib/component/sink.c | 2 +- lib/component/source.c | 2 +- plugins/ctf/lttng-live/lttng-live.c | 2 +- plugins/muxer/muxer.c | 2 +- plugins/text/text.c | 2 +- plugins/trimmer/iterator.c | 2 +- plugins/trimmer/trimmer.c | 2 +- plugins/writer/writer.c | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) rename include/babeltrace/component/{filter-internal.h => component-filter-internal.h} (100%) rename include/babeltrace/component/{filter.h => component-filter.h} (100%) rename include/babeltrace/component/{sink-internal.h => component-sink-internal.h} (100%) rename include/babeltrace/component/{sink.h => component-sink.h} (100%) rename include/babeltrace/component/{source-internal.h => component-source-internal.h} (100%) rename include/babeltrace/component/{source.h => component-source.h} (100%) diff --git a/converter/babeltrace.c b/converter/babeltrace.c index ca94cb82..02ac4853 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -29,9 +29,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/Makefile.am b/include/Makefile.am index 33ac2673..db5c6ffd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -49,9 +49,9 @@ babeltracecomponentinclude_HEADERS = \ babeltrace/component/component-class-sink.h \ babeltrace/component/component-connection.h \ babeltrace/component/component-graph.h \ - babeltrace/component/source.h \ - babeltrace/component/sink.h \ - babeltrace/component/filter.h \ + babeltrace/component/component-source.h \ + babeltrace/component/component-sink.h \ + babeltrace/component/component-filter.h \ babeltrace/component/notification/eot.h \ babeltrace/component/notification/notification.h \ babeltrace/component/notification/event.h \ @@ -125,9 +125,9 @@ noinst_HEADERS = \ babeltrace/component/component-connection-internal.h \ babeltrace/component/component-internal.h \ babeltrace/component/component-graph-internal.h \ - babeltrace/component/filter-internal.h \ - babeltrace/component/sink-internal.h \ - babeltrace/component/source-internal.h \ + babeltrace/component/component-filter-internal.h \ + babeltrace/component/component-sink-internal.h \ + babeltrace/component/component-source-internal.h \ babeltrace/component/input.h \ babeltrace/component/notification/eot-internal.h \ babeltrace/component/notification/event-internal.h \ diff --git a/include/babeltrace/component/filter-internal.h b/include/babeltrace/component/component-filter-internal.h similarity index 100% rename from include/babeltrace/component/filter-internal.h rename to include/babeltrace/component/component-filter-internal.h diff --git a/include/babeltrace/component/filter.h b/include/babeltrace/component/component-filter.h similarity index 100% rename from include/babeltrace/component/filter.h rename to include/babeltrace/component/component-filter.h diff --git a/include/babeltrace/component/sink-internal.h b/include/babeltrace/component/component-sink-internal.h similarity index 100% rename from include/babeltrace/component/sink-internal.h rename to include/babeltrace/component/component-sink-internal.h diff --git a/include/babeltrace/component/sink.h b/include/babeltrace/component/component-sink.h similarity index 100% rename from include/babeltrace/component/sink.h rename to include/babeltrace/component/component-sink.h diff --git a/include/babeltrace/component/source-internal.h b/include/babeltrace/component/component-source-internal.h similarity index 100% rename from include/babeltrace/component/source-internal.h rename to include/babeltrace/component/component-source-internal.h diff --git a/include/babeltrace/component/source.h b/include/babeltrace/component/component-source.h similarity index 100% rename from include/babeltrace/component/source.h rename to include/babeltrace/component/component-source.h diff --git a/lib/component/component.c b/lib/component/component.c index d82ee0d8..fe1179c2 100644 --- a/lib/component/component.c +++ b/lib/component/component.c @@ -29,10 +29,10 @@ #include #include #include -#include -#include +#include +#include +#include #include -#include #include #include #include diff --git a/lib/component/filter.c b/lib/component/filter.c index 53c0091e..f99e5999 100644 --- a/lib/component/filter.c +++ b/lib/component/filter.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/component/iterator.c b/lib/component/iterator.c index 98c4f355..c8c41a0b 100644 --- a/lib/component/iterator.c +++ b/lib/component/iterator.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/component/sink.c b/lib/component/sink.c index 22ca5c99..954e758a 100644 --- a/lib/component/sink.c +++ b/lib/component/sink.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/lib/component/source.c b/lib/component/source.c index 7b51590c..c75c556d 100644 --- a/lib/component/source.c +++ b/lib/component/source.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/plugins/ctf/lttng-live/lttng-live.c b/plugins/ctf/lttng-live/lttng-live.c index 9bbf4b17..d797cbd1 100644 --- a/plugins/ctf/lttng-live/lttng-live.c +++ b/plugins/ctf/lttng-live/lttng-live.c @@ -27,7 +27,7 @@ */ #include "lttng-live-internal.h" -#include +#include BT_HIDDEN enum bt_component_status lttng_live_iterator_init(struct bt_component *source, diff --git a/plugins/muxer/muxer.c b/plugins/muxer/muxer.c index 04171d75..ba4e2c4e 100644 --- a/plugins/muxer/muxer.c +++ b/plugins/muxer/muxer.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/plugins/text/text.c b/plugins/text/text.c index 4ddca35c..109ac4af 100644 --- a/plugins/text/text.c +++ b/plugins/text/text.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/plugins/trimmer/iterator.c b/plugins/trimmer/iterator.c index 942b0264..d7633a9c 100644 --- a/plugins/trimmer/iterator.c +++ b/plugins/trimmer/iterator.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/plugins/trimmer/trimmer.c b/plugins/trimmer/trimmer.c index 6d94ddf2..1f9f48a3 100644 --- a/plugins/trimmer/trimmer.c +++ b/plugins/trimmer/trimmer.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/plugins/writer/writer.c b/plugins/writer/writer.c index 089a3d59..320642f9 100644 --- a/plugins/writer/writer.c +++ b/plugins/writer/writer.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include -- 2.34.1