include: rename mount-api-utils.h to mountutils.h

Keep the filename consistent with other header filenames.

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

diff --git a/include/Makemodule.am b/include/Makemodule.am
index 206f12034e8ef0f0bce2b2f4f1656e7b833b2ed7..143677c8b9fed68bc4577ab2fa471bb3ec2866c5 100644 (file)
--- a/include/Makemodule.am
+++ b/include/Makemodule.am
@@ -46,7 +46,7 @@ dist_noinst_HEADERS += \
        include/md5.h \
        include/minix.h \
        include/monotonic.h \
-       include/mount-api-utils.h \
+       include/mountutils.h \
        include/namespace.h \
        include/netaddrq.h \
        include/netlink.h \

diff --git a/include/mount-api-utils.h b/include/mountutils.h
similarity index 99%
rename from include/mount-api-utils.h
rename to include/mountutils.h
index e77db065553a66adb1fb9df633de39678c8c58fc..e77f20c2af273b2b55bb493c29ea10f90a1ee120 100644 (file)
--- a/include/mount-api-utils.h
+++ b/include/mountutils.h
@@ -2,8 +2,8 @@
  * No copyright is claimed.  This code is in the public domain; do with
  * it what you wish.
  */
-#ifndef UTIL_LINUX_MOUNT_API_UTILS
-#define UTIL_LINUX_MOUNT_API_UTILS
+#ifndef UTIL_LINUX_MOUNTUTILS_H
+#define UTIL_LINUX_MOUNTUTILS_H
 
 #ifdef HAVE_LINUX_MOUNT_H
 #include <linux/mount.h>
@@ -486,4 +486,4 @@ static inline int has_listmount(void)
 
 #endif /* HAVE_LINUX_MOUNT_H */
 
-#endif /* UTIL_LINUX_MOUNT_API_UTILS */
+#endif /* UTIL_LINUX_MOUNTUTILS_H */

diff --git a/libmount/samples/listmount.c b/libmount/samples/listmount.c
index e346ebbe5842f199c053a098e36b07a2e298b48e..5d7d9e43c3564ab860f6348e71111ed264dbce3b 100644 (file)
--- a/libmount/samples/listmount.c
+++ b/libmount/samples/listmount.c
@@ -13,7 +13,7 @@
 
 #include "libmount.h"
 
-#include "mount-api-utils.h"   /* fallback for old linux/mount.h */
+#include "mountutils.h"        /* fallback for old linux/mount.h */
 
 static void __iter_table(      struct libmnt_table *tb,
                        struct libmnt_iter *itr, int output, int reverse)

diff --git a/libmount/samples/statmount.c b/libmount/samples/statmount.c
index 3e5f2f8b2b7a8399959c2632d18d5708dc4d35d7..fd2961f84fd3a89312098d58500acb330bb15a9c 100644 (file)
--- a/libmount/samples/statmount.c
+++ b/libmount/samples/statmount.c
@@ -10,7 +10,7 @@
 #include "strutils.h"
 #include "libmount.h"
 
-#include "mount-api-utils.h"   /* fallback for old linux/mount.h */
+#include "mountutils.h"        /* fallback for old linux/mount.h */
 
 int main(int argc, char *argv[])
 {

diff --git a/libmount/src/context.c b/libmount/src/context.c
index 3f1119000a555988382c34397e57ebc4e06e9e91..9d6e0e59bd61ab2b18b7728e95ce0c9cd81721eb 100644 (file)
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -44,7 +44,6 @@
 #include <stdarg.h>
 #include <sys/wait.h>
 
-#include "mount-api-utils.h"
 #include "strv.h"
 
 /**

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index 02b86585cd6dd027219fd8718cb5e6632ebee3f1..abe7c6fc65783a23bd7db8515cef57d5e1ea7c62 100644 (file)
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -33,7 +33,7 @@
 #include "buffer.h"
 #include "libmount.h"
 
-#include "mount-api-utils.h"
+#include "mountutils.h"
 
 /*
  * Debug

diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
index 688ee67c65081d94e51852fdd013af97eea7fe8d..af1ec334f837cd8f1273af884566c194b3897c9f 100644 (file)
--- a/sys-utils/mountpoint.c
+++ b/sys-utils/mountpoint.c
@@ -31,7 +31,7 @@
 #include "c.h"
 #include "closestream.h"
 #include "pathnames.h"
-#include "mount-api-utils.h"
+#include "mountutils.h"
 
 #define MOUNTPOINT_EXIT_NOMNT  32
 

diff --git a/tests/helpers/test_sysinfo.c b/tests/helpers/test_sysinfo.c
index 47c5eeda4a41231f13002be9781f6bf9c66d3226..b9657dfe91ea21479444cb1c0839d9cfe63dc8fb 100644 (file)
--- a/tests/helpers/test_sysinfo.c
+++ b/tests/helpers/test_sysinfo.c
@@ -32,7 +32,7 @@
 
 #ifdef __linux__
 # include <sys/mount.h>
-# include "mount-api-utils.h"
+# include "mountutils.h"
 #endif
 
 #ifdef HAVE_LINUX_NSFS_H