From 35161d1719f12e568a9ab7b6f976749dcac2d823 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Wed, 22 May 2024 18:42:13 +0000
Subject: [PATCH] Clean-up: sessiond: client.cpp: list of inclusions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Correct some inconsistencies in the list of inclusions in client.cpp:
  - include headers under common using angle-brackets
  - only include the top-level lttng.h lttng-ctl header

Change-Id: I1dcbacf9d4546205752f2083e1f95f958fbbfe83
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/bin/lttng-sessiond/client.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/bin/lttng-sessiond/client.cpp b/src/bin/lttng-sessiond/client.cpp
index cea7763d6..5f9a1d0d7 100644
--- a/src/bin/lttng-sessiond/client.cpp
+++ b/src/bin/lttng-sessiond/client.cpp
@@ -11,32 +11,31 @@
 #include "clear.hpp"
 #include "client.hpp"
 #include "cmd.hpp"
-#include "common/buffer-view.hpp"
-#include "common/compat/socket.hpp"
-#include "common/dynamic-array.hpp"
-#include "common/dynamic-buffer.hpp"
-#include "common/fd-handle.hpp"
-#include "common/payload-view.hpp"
-#include "common/payload.hpp"
-#include "common/sessiond-comm/sessiond-comm.hpp"
 #include "health-sessiond.hpp"
 #include "kernel.hpp"
 #include "lttng-sessiond.hpp"
-#include "lttng/lttng-error.h"
-#include "lttng/tracker.h"
 #include "manage-consumer.hpp"
 #include "save.hpp"
 #include "testpoint.hpp"
 #include "utils.hpp"
 
+#include <common/buffer-view.hpp>
 #include <common/compat/getenv.hpp>
+#include <common/compat/socket.hpp>
+#include <common/dynamic-array.hpp>
+#include <common/dynamic-buffer.hpp>
 #include <common/exception.hpp>
+#include <common/fd-handle.hpp>
+#include <common/payload-view.hpp>
+#include <common/payload.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
 #include <common/tracker.hpp>
 #include <common/unix.hpp>
 #include <common/utils.hpp>
 
 #include <lttng/error-query-internal.hpp>
 #include <lttng/event-internal.hpp>
+#include <lttng/lttng.h>
 #include <lttng/session-descriptor-internal.hpp>
 #include <lttng/session-internal.hpp>
 #include <lttng/userspace-probe-internal.hpp>
-- 
2.34.1