From 7d55361f7b41ed8d44a71c17dfeecd316ca77460 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 23 Feb 2017 08:45:01 -0500 Subject: [PATCH] Remove component prefix from graph, connection and port filenames MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- converter/babeltrace.c | 6 +++--- include/Makefile.am | 12 ++++++------ include/babeltrace/component/component-internal.h | 2 +- ...t-connection-internal.h => connection-internal.h} | 2 +- .../{component-connection.h => connection.h} | 0 .../{component-graph-internal.h => graph-internal.h} | 2 +- .../component/{component-graph.h => graph.h} | 0 .../{component-port-internal.h => port-internal.h} | 2 +- .../component/{component-port.h => port.h} | 0 lib/component/Makefile.am | 6 +++--- lib/component/component.c | 2 +- .../{component-connection.c => connection.c} | 8 ++++---- lib/component/{component-graph.c => graph.c} | 8 ++++---- lib/component/{component-port.c => port.c} | 4 ++-- lib/component/source.c | 2 +- plugins/text/text.c | 4 ++-- plugins/utils/dummy/dummy.h | 4 ++-- plugins/utils/trimmer/iterator.c | 4 ++-- plugins/writer/writer.c | 4 ++-- 19 files changed, 36 insertions(+), 36 deletions(-) rename include/babeltrace/component/{component-connection-internal.h => connection-internal.h} (97%) rename include/babeltrace/component/{component-connection.h => connection.h} (100%) rename include/babeltrace/component/{component-graph-internal.h => graph-internal.h} (97%) rename include/babeltrace/component/{component-graph.h => graph.h} (100%) rename include/babeltrace/component/{component-port-internal.h => port-internal.h} (97%) rename include/babeltrace/component/{component-port.h => port.h} (100%) rename lib/component/{component-connection.c => connection.c} (94%) rename lib/component/{component-graph.c => graph.c} (98%) rename lib/component/{component-port.c => port.c} (98%) diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 9bc282d76..aa985a34d 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -34,9 +34,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/Makefile.am b/include/Makefile.am index 9ae5d5bea..ba2ad2bf9 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -57,9 +57,9 @@ babeltracecomponentinclude_HEADERS = \ babeltrace/component/component-class-source.h \ babeltrace/component/component-class-filter.h \ babeltrace/component/component-class-sink.h \ - babeltrace/component/component-connection.h \ - babeltrace/component/component-port.h \ - babeltrace/component/component-graph.h \ + babeltrace/component/connection.h \ + babeltrace/component/port.h \ + babeltrace/component/graph.h \ babeltrace/component/component-source.h \ babeltrace/component/component-sink.h \ babeltrace/component/component-filter.h @@ -129,10 +129,10 @@ noinst_HEADERS = \ babeltrace/plugin/plugin-python-enabled-internal.h \ babeltrace/plugin/plugin-python-disabled-internal.h \ babeltrace/component/component-class-internal.h \ - babeltrace/component/component-connection-internal.h \ - babeltrace/component/component-port-internal.h \ + babeltrace/component/connection-internal.h \ + babeltrace/component/port-internal.h \ babeltrace/component/component-internal.h \ - babeltrace/component/component-graph-internal.h \ + babeltrace/component/graph-internal.h \ babeltrace/component/component-filter-internal.h \ babeltrace/component/component-sink-internal.h \ babeltrace/component/component-source-internal.h \ diff --git a/include/babeltrace/component/component-internal.h b/include/babeltrace/component/component-internal.h index b6dfc8801..e70f9e96a 100644 --- a/include/babeltrace/component/component-internal.h +++ b/include/babeltrace/component/component-internal.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/babeltrace/component/component-connection-internal.h b/include/babeltrace/component/connection-internal.h similarity index 97% rename from include/babeltrace/component/component-connection-internal.h rename to include/babeltrace/component/connection-internal.h index c552636ed..d2f51ca02 100644 --- a/include/babeltrace/component/component-connection-internal.h +++ b/include/babeltrace/component/connection-internal.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #include struct bt_graph; diff --git a/include/babeltrace/component/component-connection.h b/include/babeltrace/component/connection.h similarity index 100% rename from include/babeltrace/component/component-connection.h rename to include/babeltrace/component/connection.h diff --git a/include/babeltrace/component/component-graph-internal.h b/include/babeltrace/component/graph-internal.h similarity index 97% rename from include/babeltrace/component/component-graph-internal.h rename to include/babeltrace/component/graph-internal.h index 615f4aafb..7da6255fa 100644 --- a/include/babeltrace/component/component-graph-internal.h +++ b/include/babeltrace/component/graph-internal.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #include #include #include diff --git a/include/babeltrace/component/component-graph.h b/include/babeltrace/component/graph.h similarity index 100% rename from include/babeltrace/component/component-graph.h rename to include/babeltrace/component/graph.h diff --git a/include/babeltrace/component/component-port-internal.h b/include/babeltrace/component/port-internal.h similarity index 97% rename from include/babeltrace/component/component-port-internal.h rename to include/babeltrace/component/port-internal.h index 39b19e33d..437ba827c 100644 --- a/include/babeltrace/component/component-port-internal.h +++ b/include/babeltrace/component/port-internal.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/component-port.h b/include/babeltrace/component/port.h similarity index 100% rename from include/babeltrace/component/component-port.h rename to include/babeltrace/component/port.h diff --git a/lib/component/Makefile.am b/lib/component/Makefile.am index 901c25fb3..7471a4b56 100644 --- a/lib/component/Makefile.am +++ b/lib/component/Makefile.am @@ -8,9 +8,9 @@ noinst_LTLIBRARIES = libcomponent.la libcomponent_la_SOURCES = \ component.c \ component-class.c \ - component-graph.c \ - component-connection.c \ - component-port.c \ + graph.c \ + connection.c \ + port.c \ source.c \ sink.c \ filter.c \ diff --git a/lib/component/component.c b/lib/component/component.c index 8056db14e..50eb4ea2b 100644 --- a/lib/component/component.c +++ b/lib/component/component.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/component/component-connection.c b/lib/component/connection.c similarity index 94% rename from lib/component/component-connection.c rename to lib/component/connection.c index 3b509c390..8867e4f0d 100644 --- a/lib/component/component-connection.c +++ b/lib/component/connection.c @@ -1,5 +1,5 @@ /* - * component-connection.c + * connection.c * * Babeltrace Connection * @@ -26,9 +26,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lib/component/component-graph.c b/lib/component/graph.c similarity index 98% rename from lib/component/component-graph.c rename to lib/component/graph.c index 57a8cc41c..4d6c28023 100644 --- a/lib/component/component-graph.c +++ b/lib/component/graph.c @@ -1,5 +1,5 @@ /* - * component-graph.c + * graph.c * * Babeltrace Plugin Component Graph * @@ -27,12 +27,12 @@ */ #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include diff --git a/lib/component/component-port.c b/lib/component/port.c similarity index 98% rename from lib/component/component-port.c rename to lib/component/port.c index b08da58d4..8aa9a462f 100644 --- a/lib/component/component-port.c +++ b/lib/component/port.c @@ -1,5 +1,5 @@ /* - * component-port.c + * port.c * * Babeltrace Port * @@ -27,7 +27,7 @@ */ #include -#include +#include #include #include diff --git a/lib/component/source.c b/lib/component/source.c index adbf8ed72..e0c717b3d 100644 --- a/lib/component/source.c +++ b/lib/component/source.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/plugins/text/text.c b/plugins/text/text.c index 8a916fc35..cbb86e0c1 100644 --- a/plugins/text/text.c +++ b/plugins/text/text.c @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/plugins/utils/dummy/dummy.h b/plugins/utils/dummy/dummy.h index a0c674e31..35e5af673 100644 --- a/plugins/utils/dummy/dummy.h +++ b/plugins/utils/dummy/dummy.h @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include struct dummy { GPtrArray *iterators; diff --git a/plugins/utils/trimmer/iterator.c b/plugins/utils/trimmer/iterator.c index 9b54a166c..bf3229ee8 100644 --- a/plugins/utils/trimmer/iterator.c +++ b/plugins/utils/trimmer/iterator.c @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/plugins/writer/writer.c b/plugins/writer/writer.c index 1c8faab12..d7765e7cb 100644 --- a/plugins/writer/writer.c +++ b/plugins/writer/writer.c @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include -- 2.34.1