[glib/wip/msanchez/libmount: 2/8] Added placeholders for the libmount-based implementation

[Mario Sanchez Prada <msanchez src gnome org>]

commit b412b9e71fb24c888c06ca0d79cd87b8f1347edf
Author: Mario Sanchez Prada <mario endlessm com>
Date:   Tue May 17 20:31:23 2016 +0100

    Added placeholders for the libmount-based implementation
    
    https://bugzilla.gnome.org/show_bug.cgi?id=522053

 gio/gunixmounts.c |   58 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 12 deletions(-)
---
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 2e2ff5e..33cf675 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -150,6 +150,9 @@ static guint64 mount_poller_time = 0;
 
 #ifdef HAVE_MNTENT_H
 #include <mntent.h>
+#ifdef HAVE_LIBMOUNT
+//TODO
+#endif // HAVE_LIBMOUNT
 #elif defined (HAVE_SYS_MNTTAB_H)
 #include <sys/mnttab.h>
 #endif
@@ -326,22 +329,19 @@ guess_system_internal (const char *mountpoint,
 /* mntent.h (Linux, GNU, NSS) {{{2 */
 #ifdef HAVE_MNTENT_H
 
-static char *
-get_mtab_read_file (void)
+#ifdef HAVE_LIBMOUNT
+
+static GList *
+_g_get_unix_mounts (void)
 {
-#ifdef _PATH_MOUNTED
-# ifdef __linux__
-  return "/proc/mounts";
-# else
-  return _PATH_MOUNTED;
-# endif
-#else
-  return "/etc/mtab";
-#endif
+  //TODO
+  return NULL;
 }
 
+#else
+
 static char *
-get_mtab_monitor_file (void)
+get_mtab_read_file (void)
 {
 #ifdef _PATH_MOUNTED
 # ifdef __linux__
@@ -439,6 +439,22 @@ _g_get_unix_mounts (void)
   return g_list_reverse (return_list);
 }
 
+#endif // HAVE_LIBMOUNT
+
+static char *
+get_mtab_monitor_file (void)
+{
+#ifdef _PATH_MOUNTED
+# ifdef __linux__
+  return "/proc/mounts";
+# else
+  return _PATH_MOUNTED;
+# endif
+#else
+  return "/etc/mtab";
+#endif
+}
+
 /* mnttab.h {{{2 */
 #elif defined (HAVE_SYS_MNTTAB_H)
 
@@ -728,6 +744,9 @@ _g_get_unix_mounts (void)
 static char *
 get_fstab_file (void)
 {
+#ifdef HAVE_LIBMOUNT
+// TODO
+#else
 #if defined(HAVE_SYS_MNTCTL_H) && defined(HAVE_SYS_VMOUNT_H) && defined(HAVE_SYS_VFS_H)
   /* AIX */
   return "/etc/filesystems";
@@ -738,10 +757,23 @@ get_fstab_file (void)
 #else
   return "/etc/fstab";
 #endif
+#endif // HAVE_LIBMOUNT
 }
 
 /* mntent.h (Linux, GNU, NSS) {{{2 */
 #ifdef HAVE_MNTENT_H
+
+#ifdef HAVE_LIBMOUNT
+
+static GList *
+_g_get_unix_mount_points (void)
+{
+  //TODO
+  return NULL;
+}
+
+#else
+
 static GList *
 _g_get_unix_mount_points (void)
 {
@@ -822,6 +854,8 @@ _g_get_unix_mount_points (void)
   return g_list_reverse (return_list);
 }
 
+#endif // HAVE_LIBMOUNT
+
 /* mnttab.h {{{2 */
 #elif defined (HAVE_SYS_MNTTAB_H)