Cleanup: src.ctf.lttng-live: add missing `#include <stdint.h>`

Use stdint.h whenever only uint*_t are need and inttypes.h when
printf-like identifier are need (e.g. %PRIu64).

And reorder some #include statements.

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Ic69636e4ac316a86f88ba0bdd8ad435b38db0e6a
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2313

diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c
index ce3049638d00692381314de69f8caf6fff97be1a..61777519e7819e1f4253f9b02b1c2ded3c907dd7 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.c
+++ b/src/plugins/ctf/lttng-live/data-stream.c
@@ -28,16 +28,17 @@
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/DS"
 #include "logging/comp-logging.h"
 
+#include <inttypes.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
+
 #include <glib.h>
-#include <inttypes.h>
-#include "compat/mman.h"
+
 #include <babeltrace2/babeltrace.h>
+
 #include "../common/msg-iter/msg-iter.h"
 #include "common/assert.h"
-
+#include "compat/mman.h"
 #include "data-stream.h"
 
 #define STREAM_NAME_PREFIX     "stream-"

diff --git a/src/plugins/ctf/lttng-live/data-stream.h b/src/plugins/ctf/lttng-live/data-stream.h
index 94943e2aa79081487eed93c8211aed3818b06f14..1fcaced3911956e0f2f7f9701417ea6bbf0cb81f 100644 (file)
--- a/src/plugins/ctf/lttng-live/data-stream.h
+++ b/src/plugins/ctf/lttng-live/data-stream.h
@@ -24,12 +24,12 @@
  */
 
 #include <stdio.h>
+#include <stdint.h>
+
 #include <glib.h>
-#include "common/macros.h"
-#include <babeltrace2/babeltrace.h>
 
-#include "lttng-live.h"
 #include "../common/msg-iter/msg-iter.h"
+#include "lttng-live.h"
 
 enum lttng_live_iterator_status lttng_live_lazy_msg_init(
                struct lttng_live_session *session);

diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c
index 87efe7a681784a463df969d2ceae039c794daca1..699c5c925d40db0db2a68945fbab183effdbfb54 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.c
+++ b/src/plugins/ctf/lttng-live/lttng-live.c
@@ -33,11 +33,12 @@
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE"
 #include "logging/comp-logging.h"
 
-#include <glib.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <unistd.h>
 
+#include <glib.h>
+
 #include "common/assert.h"
 #include <babeltrace2/babeltrace.h>
 #include "compat/compiler.h"

diff --git a/src/plugins/ctf/lttng-live/lttng-live.h b/src/plugins/ctf/lttng-live/lttng-live.h
index 511c0c486793e9d98ecd774ad6b223847bac8ec2..bd5b317d96b8d96116a05ac57c285bb59d5db340 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.h
+++ b/src/plugins/ctf/lttng-live/lttng-live.h
@@ -30,13 +30,15 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
+
+#include <glib.h>
 
-#include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 
+#include "common/macros.h"
 #include "../common/metadata/decoder.h"
 #include "../common/msg-iter/msg-iter.h"
-
 #include "viewer-connection.h"
 
 struct lttng_live_component;

diff --git a/src/plugins/ctf/lttng-live/lttng-viewer-abi.h b/src/plugins/ctf/lttng-live/lttng-viewer-abi.h
index 9f6154ba82b0436dbb3c4fed6405b736685dddbc..a58956a4ff252111f16054cbf24e7bf6aa365ac8 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-viewer-abi.h
+++ b/src/plugins/ctf/lttng-live/lttng-viewer-abi.h
@@ -25,6 +25,7 @@
  * SOFTWARE.
  */
 
+#include <stdint.h>
 #include "compat/limits.h"
 
 #define LTTNG_VIEWER_PATH_MAX          4096

diff --git a/src/plugins/ctf/lttng-live/metadata.h b/src/plugins/ctf/lttng-live/metadata.h
index 0731c33d93d5c9e8ae90e8c41bd67968465d6b19..6915753d5581c6f6145e739fe8d9020303e05d5f 100644 (file)
--- a/src/plugins/ctf/lttng-live/metadata.h
+++ b/src/plugins/ctf/lttng-live/metadata.h
@@ -23,10 +23,9 @@
  * SOFTWARE.
  */
 
+#include <stdint.h>
 #include <stdio.h>
-#include <glib.h>
-#include "common/macros.h"
-#include <babeltrace2/babeltrace.h>
+
 #include "lttng-live.h"
 
 int lttng_live_metadata_create_stream(struct lttng_live_session *session,

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.c b/src/plugins/ctf/lttng-live/viewer-connection.c
index befffb30a8c6117c096f9df086c7ff12823781ad..132591e78eef371699c6c431f4fb8a5f3130bfcf 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.c
+++ b/src/plugins/ctf/lttng-live/viewer-connection.c
@@ -26,15 +26,15 @@
 #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/VIEWER"
 #include "logging/comp-logging.h"
 
-#include <stdio.h>
+#include <fcntl.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
+#include <sys/types.h>
 #include <unistd.h>
+
 #include <glib.h>
-#include <inttypes.h>
-#include <sys/types.h>
-#include <fcntl.h>
 
 #include "compat/socket.h"
 #include "compat/endian.h"

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.h b/src/plugins/ctf/lttng-live/viewer-connection.h
index c42c16b05cfd8187e92147f1920a8d263c813d2f..ca5883e840491bc7ae6b9a95442a37abb2056536 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.h
+++ b/src/plugins/ctf/lttng-live/viewer-connection.h
@@ -24,9 +24,13 @@
  */
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
+
 #include <glib.h>
 
+#include <babeltrace2/babeltrace.h>
+
 #include "common/macros.h"
 #include "compat/socket.h"