[Xfce4-commits] <xfce4-mount-plugin:master> Fix compilation with --enable-debug=full
Landry Breuil
noreply at xfce.org
Sun Apr 15 10:48:01 CEST 2012
Updating branch refs/heads/master
to a49e596bc4f7daad53995bfdf8f6e79f667f2a42 (commit)
from 8d6faab375f902631457bace31fa8f9debf201b6 (commit)
commit a49e596bc4f7daad53995bfdf8f6e79f667f2a42
Author: Mike Massonnet <mmassonnet at gmail.com>
Date: Sat Apr 14 21:13:16 2012 +0200
Fix compilation with --enable-debug=full
Signed-off-by: Landry Breuil <landry at xfce.org>
panel-plugin/devices.c | 26 +++++++++++++-------------
panel-plugin/mount-plugin.c | 9 ++++-----
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c
index cafb5ca..82b7062 100644
--- a/panel-plugin/devices.c
+++ b/panel-plugin/devices.c
@@ -35,7 +35,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef HAVE_GETMNTENT
#include <mntent.h>
#include <sys/vfs.h>
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
#include <sys/param.h>
#include <sys/mount.h>
#else
@@ -593,7 +593,7 @@ disks_refresh(GPtrArray * pdisks, GPtrArray *excluded_FSs)
#ifdef HAVE_GETMNTENT
FILE * fmtab = NULL; /* file /etc/mtab */
struct mntent * pmntent = NULL; /* struct for mnt info */
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
int i, nb_mounted_fs = 0;
#endif
struct statfs * pstatfs = NULL;
@@ -613,7 +613,7 @@ disks_refresh(GPtrArray * pdisks, GPtrArray *excluded_FSs)
/* open file */
fmtab = setmntent (MTAB, "r"); /* mtab file */
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
/* get mounted fs */
nb_mounted_fs = getmntinfo(&pstatfs,MNT_WAIT);
#endif
@@ -625,7 +625,7 @@ disks_refresh(GPtrArray * pdisks, GPtrArray *excluded_FSs)
DBG (" have entry: %s on %s", pmntent->mnt_fsname, pmntent->mnt_dir );
statfs (pmntent->mnt_dir, pstatfs);
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
for (i = 0; i < nb_mounted_fs ; i++) {
DBG (" have entry: %s on %s : type %s", pstatfs[i].f_mntfromname, pstatfs[i].f_mntonname, pstatfs[i].f_fstypename );
#endif
@@ -636,13 +636,13 @@ disks_refresh(GPtrArray * pdisks, GPtrArray *excluded_FSs)
/* CHANGED to reflect change in disk_search */
#ifdef HAVE_GETMNTENT
pdisk = disks_search (pdisks, pmntent->mnt_dir);
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
pdisk = disks_search (pdisks, pstatfs[i].f_mntonname);
#endif
if (excluded_FSs!=NULL)
#ifdef HAVE_GETMNTENT
exclude = exclude_filesystem (excluded_FSs, pmntent->mnt_dir, pmntent->mnt_fsname);
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
exclude = exclude_filesystem (excluded_FSs, pstatfs[i].f_mntonname, pstatfs[i].f_mntfromname);
#endif
@@ -660,7 +660,7 @@ disks_refresh(GPtrArray * pdisks, GPtrArray *excluded_FSs)
g_str_has_prefix(pmntent->mnt_type, "cifs") ||
g_str_has_prefix(pmntent->mnt_type, "shfs") ) ||
g_str_has_prefix(pmntent->mnt_dir, "/sys/")
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
/* TODO: add support for more fs types on BSD */
g_ascii_strcasecmp(pstatfs[i].f_mntonname, "none") == 0 ||
!g_str_has_prefix(pstatfs[i].f_mntfromname, "/dev/") ||
@@ -673,7 +673,7 @@ disks_refresh(GPtrArray * pdisks, GPtrArray *excluded_FSs)
#ifdef HAVE_GETMNTENT
pdisk = disk_new (pmntent->mnt_fsname, pmntent->mnt_dir);
pdisk->dc = disk_classify (pmntent->mnt_fsname, pmntent->mnt_dir);
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
pdisk = disk_new (pstatfs[i].f_mntfromname, pstatfs[i].f_mntonname);
pdisk->dc = disk_classify (pstatfs[i].f_mntfromname, pstatfs[i].f_mntonname);
#endif
@@ -684,7 +684,7 @@ disks_refresh(GPtrArray * pdisks, GPtrArray *excluded_FSs)
#ifdef HAVE_GETMNTENT
mount_info = mount_info_new_from_stat (pstatfs, pmntent->mnt_type,
pmntent->mnt_dir);
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
mount_info = mount_info_new_from_stat (&pstatfs[i], pstatfs[i].f_fstypename,
pstatfs[i].f_mntonname);
#endif
@@ -740,7 +740,7 @@ disk_check_mounted (const char *disk)
#ifdef HAVE_GETMNTENT
FILE *fmtab = NULL; /* file /etc/mtab */
struct mntent *pmntent = NULL; /* struct for mnt info */
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
struct statfs * pstatfs = NULL;
int i, nb_mounted_fs = 0;
#endif
@@ -749,7 +749,7 @@ disk_check_mounted (const char *disk)
#ifdef HAVE_GETMNTENT
/* open file */
fmtab = setmntent (MTAB, "r"); /* mtab file */
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
/* get mounted fs */
nb_mounted_fs = getmntinfo(&pstatfs,MNT_WAIT);
#endif
@@ -757,14 +757,14 @@ disk_check_mounted (const char *disk)
/* start looking for mounted devices */
#ifdef HAVE_GETMNTENT
for (pmntent=getmntent(fmtab); pmntent!=NULL; pmntent=getmntent(fmtab))
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
for (i = 0; i < nb_mounted_fs ; i++)
#endif
{
#ifdef HAVE_GETMNTENT
if (strcmp(pmntent->mnt_dir, disk)==0 ||
strcmp(pmntent->mnt_fsname, disk)==0 )
-#elif HAVE_GETMNTINFO
+#elif defined (HAVE_GETMNTINFO)
if (strcmp(pstatfs[i].f_mntonname, disk)==0 ||
strcmp(pstatfs[i].f_mntfromname, disk)==0 )
#endif
diff --git a/panel-plugin/mount-plugin.c b/panel-plugin/mount-plugin.c
index 78f2280..7dc3a0c 100644
--- a/panel-plugin/mount-plugin.c
+++ b/panel-plugin/mount-plugin.c
@@ -267,12 +267,11 @@ mounter_free (XfcePanelPlugin *plugin, t_mounter *mounter)
static void
mounter_data_new (t_mounter *mt)
{
- unsigned int i, res;
+ unsigned int i;
t_disk * disk;
t_disk_display * disk_display;
GPtrArray *array = NULL, *disk_displays = NULL;
char *dev_mp; /* device or mountpoint */
- gboolean removed_device;
TRACE ("enters mounter_data_new");
@@ -283,13 +282,13 @@ mounter_data_new (t_mounter *mt)
if (mt->exclude_FSs) {
array = g_ptr_array_new();
DBG("excluded_filesystems=%s", mt->excluded_filesystems);
- res = seperate_list(array, mt->excluded_filesystems);
+ seperate_list(array, mt->excluded_filesystems);
for (i=0; i<array->len; i++) {
dev_mp = (char*) g_ptr_array_index(array, i);
if ( strstr(dev_mp , "/dev") )
- removed_device = disks_remove_device(mt->pdisks, dev_mp);
+ disks_remove_device(mt->pdisks, dev_mp);
else
- removed_device = disks_remove_mountpoint (mt->pdisks, dev_mp);
+ disks_remove_mountpoint (mt->pdisks, dev_mp);
}
}
More information about the Xfce4-commits
mailing list