From 3c22a2420b7a79eb5bce946bcf314349d2ebfe14 Mon Sep 17 00:00:00 2001
From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Thu, 31 Oct 2019 12:32:33 -0400
Subject: [PATCH] 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
---
 src/plugins/ctf/lttng-live/data-stream.c       |  9 +++++----
 src/plugins/ctf/lttng-live/data-stream.h       |  6 +++---
 src/plugins/ctf/lttng-live/lttng-live.c        |  3 ++-
 src/plugins/ctf/lttng-live/lttng-live.h        |  6 ++++--
 src/plugins/ctf/lttng-live/lttng-viewer-abi.h  |  1 +
 src/plugins/ctf/lttng-live/metadata.h          |  5 ++---
 src/plugins/ctf/lttng-live/viewer-connection.c | 10 +++++-----
 src/plugins/ctf/lttng-live/viewer-connection.h |  4 ++++
 8 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/plugins/ctf/lttng-live/data-stream.c b/src/plugins/ctf/lttng-live/data-stream.c
index ce304963..61777519 100644
--- 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 94943e2a..1fcaced3 100644
--- 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 87efe7a6..699c5c92 100644
--- 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 511c0c48..bd5b317d 100644
--- 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 9f6154ba..a58956a4 100644
--- 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 0731c33d..6915753d 100644
--- 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 befffb30..132591e7 100644
--- 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 c42c16b0..ca5883e8 100644
--- 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"
 
-- 
2.34.1