From: Karel Zak <kzak@redhat.com>
Date: Tue, 13 Jan 2026 17:23:33 +0000 (+0100)
Subject: include: rename mount-api-utils.h to mountutils.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f419d67de67610180fb04e64d21323ce8927d31d;p=thirdparty%2Futil-linux.git

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 206f12034..143677c8b 100644
--- 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 e77db0655..e77f20c2a 100644
--- 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 e346ebbe5..5d7d9e43c 100644
--- 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 3e5f2f8b2..fd2961f84 100644
--- 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 3f1119000..9d6e0e59b 100644
--- 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 02b86585c..abe7c6fc6 100644
--- 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 688ee67c6..af1ec334f 100644
--- 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 47c5eeda4..b9657dfe9 100644
--- 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