libmount: Add integer type headers to private header file

We use uintX_t in many places in the library, and it seems useful to
include inttypes.h and stdint.h to have access to the PRI* macros everywhere.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libmount/src/btrfs.c b/libmount/src/btrfs.c
index a831ce83756c83fd08e2176c0bc986240ab2c95b..eb569f258258c5ffcabea3bcf4f90c4d7795fbc9 100644 (file)
--- a/libmount/src/btrfs.c
+++ b/libmount/src/btrfs.c
@@ -15,7 +15,6 @@
 #include <dirent.h>
 #include <sys/ioctl.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <linux/btrfs.h>
 
 #include "mountP.h"

diff --git a/libmount/src/fuzz.c b/libmount/src/fuzz.c
index 2c847144302eb43c65748473fbcefb835bcbbd26..f4c0f8ae66b47e12f66d1ea318742e4bd7429839 100644 (file)
--- a/libmount/src/fuzz.c
+++ b/libmount/src/fuzz.c
@@ -4,7 +4,6 @@
 
 #include <stdlib.h>
 #include <stddef.h>
-#include <stdint.h>
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         struct libmnt_table *tb = NULL;

diff --git a/libmount/src/hook_idmap.c b/libmount/src/hook_idmap.c
index 814b427732968f6f416a6ce5c9e0e1b3510f2140..4592f5ef6a18546c8355e9232a7b35bf5467610b 100644 (file)
--- a/libmount/src/hook_idmap.c
+++ b/libmount/src/hook_idmap.c
@@ -20,7 +20,6 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
-#include <inttypes.h>
 
 #include "strutils.h"
 #include "all-io.h"

diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c
index f87f06816cd7a35c2c8009d7e6523a4c2c898031..d33127530c5a3d3d6cd6ab344d21989d24636b56 100644 (file)
--- a/libmount/src/hook_mount.c
+++ b/libmount/src/hook_mount.c
@@ -48,8 +48,6 @@
 #include "strutils.h"
 #include "linux_version.h"
 
-#include <inttypes.h>
-
 #ifdef USE_LIBMOUNT_MOUNTFD_SUPPORT
 
 #define get_sysapi(_cxt) mnt_context_get_sysapi(_cxt)

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index da4b60f39e3a0efae3e6df0a0f546920e6f71312..e2381e34314e5ad109a75c1a55f900d81be07586 100644 (file)
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -23,8 +23,11 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdint.h>
+#include <inttypes.h>
 
 #include "c.h"
+
 #include "list.h"
 #include "debug.h"
 #include "buffer.h"