From 9d811df5b2ff7b564c0cf32bd8fa5eea29bfec4d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 9 Feb 2011 21:36:14 +0000 Subject: [PATCH] switch EEZE_DISK_MOUNTOPT_DEFAULTS to a define SVN revision: 56882 --- legacy/eeze/src/lib/Eeze_Disk.h | 2 +- legacy/eeze/src/lib/eeze_disk.c | 1 + legacy/eeze/src/lib/eeze_disk_mount.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/legacy/eeze/src/lib/Eeze_Disk.h b/legacy/eeze/src/lib/Eeze_Disk.h index d9a30b87a6..c7f6191069 100644 --- a/legacy/eeze/src/lib/Eeze_Disk.h +++ b/legacy/eeze/src/lib/Eeze_Disk.h @@ -43,7 +43,7 @@ typedef enum typedef enum { - EEZE_DISK_MOUNTOPT_DEFAULTS = 0xf0, +#define EEZE_DISK_MOUNTOPT_DEFAULTS (EEZE_DISK_MOUNTOPT_UTF8 | EEZE_DISK_MOUNTOPT_NOEXEC | EEZE_DISK_MOUNTOPT_NOSUID) EEZE_DISK_MOUNTOPT_LOOP = (1 << 1), EEZE_DISK_MOUNTOPT_UTF8 = (1 << 2), EEZE_DISK_MOUNTOPT_NOEXEC = (1 << 3), diff --git a/legacy/eeze/src/lib/eeze_disk.c b/legacy/eeze/src/lib/eeze_disk.c index 99d6bb07de..1638824fe6 100644 --- a/legacy/eeze/src/lib/eeze_disk.c +++ b/legacy/eeze/src/lib/eeze_disk.c @@ -126,6 +126,7 @@ eeze_disk_new(const char *path) disk->device = dev; + disk->mount_opts = EEZE_DISK_MOUNTOPT_DEFAULTS; disk->mount_cmd_changed = EINA_TRUE; disk->unmount_cmd_changed = EINA_TRUE; diff --git a/legacy/eeze/src/lib/eeze_disk_mount.c b/legacy/eeze/src/lib/eeze_disk_mount.c index abb4f5ef8f..7c12fff0ea 100644 --- a/legacy/eeze/src/lib/eeze_disk_mount.c +++ b/legacy/eeze/src/lib/eeze_disk_mount.c @@ -262,7 +262,7 @@ eeze_disk_mount(Eeze_Disk *disk) } if ((!disk->mount_point) || (!disk->mount_point[0])) return EINA_FALSE; - if ((!disk->mount_opts) || (disk->mount_opts = 0xf0)) + if ((!disk->mount_opts) || (disk->mount_opts == EEZE_DISK_MOUNTOPT_DEFAULTS)) eina_strbuf_append_printf(disk->mount_cmd, "%s -o %s UUID=%s %s", EEZE_MOUNT_BIN, EEZE_MOUNT_DEFAULT_OPTS, disk->cache.uuid, disk->mount_point); else {