From 5155b005cfadade509649b8f9a3bf2c055c6edfd Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 6 Feb 2024 17:35:10 +0000 Subject: [PATCH] lib: move graph/message/iterator.h -> graph/iterator.h This file doesn't belong in the `message` directory, move it up one level, next to `iterator.c`. Change-Id: I096d91d5afa32ebb304b5132cad067e820f2bb30 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/11749 Tested-by: jenkins Reviewed-by: Philippe Proulx --- src/Makefile.am | 2 +- src/lib/error.c | 2 +- src/lib/graph/component-source.c | 2 +- src/lib/graph/component.c | 2 +- src/lib/graph/connection.c | 2 +- src/lib/graph/connection.h | 2 +- src/lib/graph/iterator.c | 2 +- src/lib/graph/{message => }/iterator.h | 0 src/lib/lib-logging.c | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename src/lib/graph/{message => }/iterator.h (100%) diff --git a/src/Makefile.am b/src/Makefile.am index 3427a88d..e01f8734 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -378,7 +378,6 @@ lib_libbabeltrace2_la_SOURCES = \ lib/graph/message/event.h \ lib/graph/message-iterator-class.c \ lib/graph/message-iterator-class.h \ - lib/graph/message/iterator.h \ lib/graph/message/message.c \ lib/graph/message/message.h \ lib/graph/message/message-iterator-inactivity.c \ @@ -408,6 +407,7 @@ lib_libbabeltrace2_la_SOURCES = \ lib/graph/interrupter.c \ lib/graph/interrupter.h \ lib/graph/iterator.c \ + lib/graph/iterator.h \ lib/graph/mip.c \ lib/graph/port.c \ lib/graph/port.h \ diff --git a/src/lib/error.c b/src/lib/error.c index ab794673..837bd416 100644 --- a/src/lib/error.c +++ b/src/lib/error.c @@ -12,9 +12,9 @@ #include #include "error.h" -#include "graph/message/iterator.h" #include "graph/component.h" #include "graph/component-class.h" +#include "graph/iterator.h" #include "common/assert.h" #include "lib/assert-cond.h" #include "lib/func-status.h" diff --git a/src/lib/graph/component-source.c b/src/lib/graph/component-source.c index 096d2425..d7315dde 100644 --- a/src/lib/graph/component-source.c +++ b/src/lib/graph/component-source.c @@ -18,7 +18,7 @@ #include "component-source.h" #include "component.h" #include "port.h" -#include "message/iterator.h" +#include "iterator.h" #include "lib/func-status.h" struct bt_component *bt_component_source_create(void) diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c index 97fff9b6..dcda0490 100644 --- a/src/lib/graph/component.c +++ b/src/lib/graph/component.c @@ -27,7 +27,7 @@ #include "component-sink.h" #include "connection.h" #include "graph.h" -#include "message/iterator.h" +#include "iterator.h" #include "port.h" #include "lib/func-status.h" diff --git a/src/lib/graph/connection.c b/src/lib/graph/connection.c index da4429d0..42accaa4 100644 --- a/src/lib/graph/connection.c +++ b/src/lib/graph/connection.c @@ -19,7 +19,7 @@ #include "component.h" #include "connection.h" #include "graph.h" -#include "message/iterator.h" +#include "iterator.h" #include "port.h" static diff --git a/src/lib/graph/connection.h b/src/lib/graph/connection.h index bc2513d5..dbc888e1 100644 --- a/src/lib/graph/connection.h +++ b/src/lib/graph/connection.h @@ -14,7 +14,7 @@ #include "common/macros.h" #include -#include "message/iterator.h" +#include "iterator.h" struct bt_graph; diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c index 73893ddb..8da13282 100644 --- a/src/lib/graph/iterator.c +++ b/src/lib/graph/iterator.c @@ -40,10 +40,10 @@ #include "component.h" #include "connection.h" #include "graph.h" +#include "iterator.h" #include "message-iterator-class.h" #include "message/discarded-items.h" #include "message/event.h" -#include "message/iterator.h" #include "message/message.h" #include "message/message-iterator-inactivity.h" #include "message/stream.h" diff --git a/src/lib/graph/message/iterator.h b/src/lib/graph/iterator.h similarity index 100% rename from src/lib/graph/message/iterator.h rename to src/lib/graph/iterator.h diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c index bf70f468..82558067 100644 --- a/src/lib/lib-logging.c +++ b/src/lib/lib-logging.c @@ -30,9 +30,9 @@ #include "graph/component.h" #include "graph/connection.h" #include "graph/graph.h" +#include "graph/iterator.h" #include "graph/message/discarded-items.h" #include "graph/message/event.h" -#include "graph/message/iterator.h" #include "graph/message/message.h" #include "graph/message/packet.h" #include "graph/message/stream.h" -- 2.34.1