Move `src/plugins/comp-logging.h` -> `src/logging/comp-logging.h`

[babeltrace.git] / src / plugins / ctf / lttng-live / metadata.c

diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c
index 8475c569633bd022170793dbf5003a1118a90d2d..910bbf0c3696f3b9207d49747cbf83bc8a8ff4e0 100644 (file)
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -27,7 +27,7 @@
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL log_level
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/META"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdio.h>
 #include <stdint.h>
@@ -120,8 +120,6 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 {
        struct lttng_live_session *session = trace->session;
        struct lttng_live_metadata *metadata = trace->metadata;
-       struct lttng_live_component *lttng_live =
-               session->lttng_live_msg_iter->lttng_live_comp;
        ssize_t ret = 0;
        size_t size, len_read = 0;
        char *metadata_buf = NULL;
@@ -188,7 +186,8 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
                        metadata->trace = NULL;
                }
                if (errno == EINTR) {
-                       if (lttng_live_graph_is_canceled(lttng_live)) {
+                       if (lttng_live_graph_is_canceled(
+                                       session->lttng_live_msg_iter)) {
                                status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
                                goto end;
                        }