From: Karel Zak <kzak@redhat.com>
Date: Mon, 25 Jul 2011 09:57:28 +0000 (+0200)
Subject: libmount: remove unnecessary includes, mask API as stable
X-Git-Tag: v2.20-rc1~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=486d3972972de4c3143e342a0a6aef819bb58f0b;p=thirdparty%2Futil-linux.git

libmount: remove unnecessary includes, mask API as stable

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

diff --git a/libmount/src/cache.c b/libmount/src/cache.c
index 7298b2820f..ecd71697c2 100644
--- a/libmount/src/cache.c
+++ b/libmount/src/cache.c
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/libmount/src/context.c b/libmount/src/context.c
index b3be915c75..70c7b33ad5 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -31,15 +31,6 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-#include "c.h"
 #include "mountP.h"
 
 /**
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index ae66a441bd..14571cd9aa 100644
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -11,14 +11,6 @@
  * @short_description: high-level API to mount operation.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
 #ifdef HAVE_LIBSELINUX
 #include <selinux/selinux.h>
 #include <selinux/context.h>
@@ -27,7 +19,6 @@
 #include <sys/wait.h>
 #include <sys/mount.h>
 
-#include "c.h"
 #include "mountP.h"
 
 /*
diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 5c52be1cf3..7c048d90ac 100644
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -11,18 +11,9 @@
  * @short_description: high-level API to umount operation.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
 #include <sys/wait.h>
 #include <sys/mount.h>
 
-#include "c.h"
 #include "pathnames.h"
 #include "strutils.h"
 #include "mountP.h"
diff --git a/libmount/src/fs.c b/libmount/src/fs.c
index 303a5d6f1a..1c7068dd0c 100644
--- a/libmount/src/fs.c
+++ b/libmount/src/fs.c
@@ -11,15 +11,10 @@
  * @short_description: represents one entry from fstab, mtab, or mountinfo file
  *
  */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include <ctype.h>
-#include <errno.h>
 #include <blkid.h>
 #include <stddef.h>
 
-#include "nls.h"
 #include "mountP.h"
 
 /**
@@ -1230,7 +1225,7 @@ int mnt_fs_match_options(struct libmnt_fs *fs, const char *options)
 /**
  * mnt_fs_print_debug
  * @fs: fstab/mtab/mountinfo entry
- * @file: output
+ * @file: file stream
  *
  * Returns: 0 on success or negative number in case of error.
  */
diff --git a/libmount/src/init.c b/libmount/src/init.c
index d80a2d8ca2..deaa14ce1a 100644
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -11,7 +11,6 @@
  * @short_description: initialize debuging
  */
 
-#include <stdlib.h>
 #include <stdarg.h>
 
 #include "mountP.h"
diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index cf3db2ffb3..63923dbc3e 100644
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -25,10 +25,6 @@
 extern "C" {
 #endif
 
-#ifndef USE_UNSTABLE_LIBMOUNT_API
-# warning libmount API is not stable yet!
-#endif
-
 #include <stdio.h>
 #include <mntent.h>
 #include <sys/types.h>
diff --git a/libmount/src/lock.c b/libmount/src/lock.c
index 2e3ca533ef..a6619b3159 100644
--- a/libmount/src/lock.c
+++ b/libmount/src/lock.c
@@ -14,13 +14,6 @@
  * locking.  Note, it's necessary to use the same locking schema in all
  * application that access the file.
  */
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
 #include <sys/time.h>
 #include <time.h>
 #include <signal.h>
@@ -29,9 +22,6 @@
 #include <sys/file.h>
 
 #include "pathnames.h"
-#include "nls.h"
-#include "c.h"
-
 #include "mountP.h"
 
 /*
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index 9c85e13b5a..644e8e89bb 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -10,14 +10,16 @@
 #ifndef _LIBMOUNT_PRIVATE_H
 #define _LIBMOUNT_PRIVATE_H
 
-#include <sys/types.h>
 #include <errno.h>
-#include "c.h"
-
-#define USE_UNSTABLE_LIBMOUNT_API
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
-#include "libmount.h"
+#include "c.h"
 #include "list.h"
+#include "libmount.h"
 
 /* features */
 #define CONFIG_LIBMOUNT_ASSERT
diff --git a/libmount/src/optmap.c b/libmount/src/optmap.c
index 1ee55222a0..2f57334db0 100644
--- a/libmount/src/optmap.c
+++ b/libmount/src/optmap.c
@@ -57,12 +57,6 @@
  * For more details about option map struct see "struct mnt_optmap" in
  * mount/mount.h.
  */
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-
-#include "nls.h"
 #include "mountP.h"
 
 /*
diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c
index c9d925ca50..2a0fc277ee 100644
--- a/libmount/src/optstr.c
+++ b/libmount/src/optstr.c
@@ -13,20 +13,13 @@
  * This is simple and low-level API to work with mount options that are stored
  * in string.
  */
-
-#include <string.h>
-#include <stdlib.h>
 #include <ctype.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #ifdef HAVE_LIBSELINUX
 #include <selinux/selinux.h>
 #include <selinux/context.h>
 #endif
 
-#include "nls.h"
 #include "mountP.h"
 
 /*
diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index e52878be11..65d0f61b13 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -41,20 +41,9 @@
  * </informalexample>
  * will returns the first entry (if UUID matches with the device).
  */
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <blkid.h>
 
-#include "nls.h"
 #include "mountP.h"
-#include "c.h"
 
 /**
  * mnt_new_table:
diff --git a/libmount/src/tab_diff.c b/libmount/src/tab_diff.c
index 5a9c9bb44b..8ea9f26b0e 100644
--- a/libmount/src/tab_diff.c
+++ b/libmount/src/tab_diff.c
@@ -10,16 +10,6 @@
  * @title: Monitor mountinfo changes
  * @short_description: monitor changes in the list of the mounted filesystems
  */
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
 #include "mountP.h"
 
 struct tabdiff_entry {
diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index bb4ceef615..37ab4466d2 100644
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -5,17 +5,11 @@
  * GNU Lesser General Public License.
  */
 
-#include <string.h>
-#include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
 #include <fcntl.h>
-#include <unistd.h>
 
-#include "nls.h"
 #include "at.h"
 #include "mangle.h"
 #include "mountP.h"
diff --git a/libmount/src/tab_update.c b/libmount/src/tab_update.c
index defdc2eea8..3d2bd00e9e 100644
--- a/libmount/src/tab_update.c
+++ b/libmount/src/tab_update.c
@@ -18,19 +18,10 @@
  *
  * It's recommended to use high-level struct libmnt_context API.
  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/file.h>
 #include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
 #include <signal.h>
 
-#include "c.h"
 #include "mountP.h"
 #include "mangle.h"
 #include "pathnames.h"
diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index 8f0e49c9b2..67389709b0 100644
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -10,13 +10,7 @@
  * @title: Utils
  * @short_description: misc utils.
  */
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 #include <ctype.h>
-#include <sys/types.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <grp.h>
diff --git a/libmount/src/version.c b/libmount/src/version.c
index a3b6d0bcd1..327188dbeb 100644
--- a/libmount/src/version.c
+++ b/libmount/src/version.c
@@ -13,9 +13,6 @@
  * @short_description: functions to get library version.
  */
 
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
 #include <ctype.h>
 
 #include "mountP.h"
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 0df10a8a42..86f3fd6871 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -31,7 +31,6 @@
 #include <assert.h>
 #include <poll.h>
 
-#define USE_UNSTABLE_LIBMOUNT_API
 #include <libmount.h>
 
 #include "pathnames.h"