[Xfce4-commits] <exo:master> Prefer getvfsstat over getfsstat (bug #3718).

[Nick Schermer]

Updating branch refs/heads/master
         to 228e8f70760538235172d576ed17140c453c2983 (commit)
       from d1aa907c12c4f3878cbefa1609a5a27cee41d5ff (commit)

commit 228e8f70760538235172d576ed17140c453c2983
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 20 19:39:02 2009 +0200

    Prefer getvfsstat over getfsstat (bug #3718).

 exo/exo-mount-point.c |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/exo/exo-mount-point.c b/exo/exo-mount-point.c
index b6d6f08..92ff40f 100644
--- a/exo/exo-mount-point.c
+++ b/exo/exo-mount-point.c
@@ -253,57 +253,57 @@ exo_mount_point_list_match_active (ExoMountPointMatchMask mask,
 
   /* close the file handle */
   fclose (fp);
-#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */
-  struct statfs *mntbuf = NULL;
-  glong          bufsize = 0;
-  gint           mntsize;
-  gint           n;
+#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */
+  struct statvfs *mntbuf = NULL;
+  glong           bufsize = 0;
+  gint            mntsize;
+  gint            n;
 
   /* determine the number of active mount points */
-  mntsize = getfsstat (NULL, 0, MNT_NOWAIT);
+  mntsize = getvfsstat (NULL, 0, MNT_NOWAIT);
   if (G_LIKELY (mntsize > 0))
     {
       /* allocate a new buffer */
       bufsize = (mntsize + 4) * sizeof (*mntbuf);
-      mntbuf = (struct statfs *) malloc (bufsize);
+      mntbuf = (struct statvfs *) malloc (bufsize);
 
       /* determine the mount point for the device file */
-      mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT);
+      mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT);
       for (n = 0; n < mntsize; ++n)
         {
           /* check if we have a match here */
-          exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname,
-                                          mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points);
+          exo_mount_point_add_if_matches (mask, device, folder, fstype,
+                                          mntbuf[n].f_mntfromname,
+                                          mntbuf[n].f_mntonname,
+                                          mntbuf[n].f_fstypename,
+                                          ((mntbuf[n].f_flag & MNT_RDONLY) != 0),
+                                          &mount_points);
         }
 
       /* release the buffer */
       free (mntbuf);
     }
-#elif defined(HAVE_GETVFSSTAT) /* Newer NetBSD */
-  struct statvfs *mntbuf = NULL;
-  glong           bufsize = 0;
-  gint            mntsize;
-  gint            n;
+#elif defined(HAVE_GETFSSTAT) /* FreeBSD, OpenBSD, DragonFly, older NetBSD */
+  struct statfs *mntbuf = NULL;
+  glong          bufsize = 0;
+  gint           mntsize;
+  gint           n;
 
   /* determine the number of active mount points */
-  mntsize = getvfsstat (NULL, 0, MNT_NOWAIT);
+  mntsize = getfsstat (NULL, 0, MNT_NOWAIT);
   if (G_LIKELY (mntsize > 0))
     {
       /* allocate a new buffer */
       bufsize = (mntsize + 4) * sizeof (*mntbuf);
-      mntbuf = (struct statvfs *) malloc (bufsize);
+      mntbuf = (struct statfs *) malloc (bufsize);
 
       /* determine the mount point for the device file */
-      mntsize = getvfsstat (mntbuf, bufsize, ST_NOWAIT);
+      mntsize = getfsstat (mntbuf, bufsize, MNT_NOWAIT);
       for (n = 0; n < mntsize; ++n)
         {
           /* check if we have a match here */
-          exo_mount_point_add_if_matches (mask, device, folder, fstype,
-                                          mntbuf[n].f_mntfromname,
-                                          mntbuf[n].f_mntonname,
-                                          mntbuf[n].f_fstypename,
-                                          ((mntbuf[n].f_flag & MNT_RDONLY) != 0),
-                                          &mount_points);
+          exo_mount_point_add_if_matches (mask, device, folder, fstype, mntbuf[n].f_mntfromname, mntbuf[n].f_mntonname,
+                                          mntbuf[n].f_fstypename, ((mntbuf[n].f_flags & MNT_RDONLY) != 0), &mount_points);
         }
 
       /* release the buffer */