logging: strip down and clean `log.h` and `log.c`

[babeltrace.git] / src / plugins / ctf / lttng-live / viewer-connection.cpp

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.cpp b/src/plugins/ctf/lttng-live/viewer-connection.cpp
index 1236ba415f6502e7d8a0583c61a877c5b9c9e1b9..2f07797833a11d9ec790ecc4d3a52846c1f52376 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.cpp
+++ b/src/plugins/ctf/lttng-live/viewer-connection.cpp
@@ -5,32 +5,25 @@
  * Copyright 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#define BT_COMP_LOG_SELF_COMP (viewer_connection->self_comp)
-#define BT_LOG_OUTPUT_LEVEL   (viewer_connection->log_level)
-#define BT_LOG_TAG            "PLUGIN/SRC.CTF.LTTNG-LIVE/VIEWER"
-#include "logging/comp-logging.h"
-
-#include <fcntl.h>
-#include <stdbool.h>
+#include <glib.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
 
-#include <glib.h>
+#include <babeltrace2/babeltrace.h>
+
+#define BT_COMP_LOG_SELF_COMP (viewer_connection->self_comp)
+#define BT_LOG_OUTPUT_LEVEL   ((enum bt_log_level) viewer_connection->log_level)
+#define BT_LOG_TAG            "PLUGIN/SRC.CTF.LTTNG-LIVE/VIEWER"
+#include "logging/comp-logging.h"
 
-#include "compat/socket.h"
-#include "compat/endian.h"
-#include "compat/compiler.h"
 #include "common/common.h"
-#include <babeltrace2/babeltrace.h>
+#include "compat/endian.h" /* IWYU pragma: keep  */
 
+#include "data-stream.hpp"
 #include "lttng-live.hpp"
-#include "viewer-connection.hpp"
 #include "lttng-viewer-abi.hpp"
-#include "data-stream.hpp"
 #include "metadata.hpp"
+#include "viewer-connection.hpp"
 
 #define viewer_handle_send_recv_status(_self_comp, _self_comp_class, _status, _action, _msg_str)   \
     do {                                                                                           \
@@ -1013,8 +1006,7 @@ static enum lttng_live_viewer_status receive_streams(struct lttng_live_session *
         if (stream.metadata_flag) {
             BT_COMP_LOGI("    metadata stream %" PRIu64 " : %s/%s", stream_id, stream.path_name,
                          stream.channel_name);
-            if (lttng_live_metadata_create_stream(session, ctf_trace_id, stream_id,
-                                                  stream.path_name)) {
+            if (lttng_live_metadata_create_stream(session, ctf_trace_id, stream_id)) {
                 BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Error creating metadata stream");
                 status = LTTNG_LIVE_VIEWER_STATUS_ERROR;
                 goto end;