From 240ba02786e2ce0fe17327e1901d8e6fe06e812e Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 14 Mar 2008 11:15:49 +0000 Subject: [PATCH] Avoid redudant tests (#521851) Patch from Josselin Mouette 2008-03-14 Alexander Larsson * gunixmounts.c: (guess_mount_type): Avoid redudant tests (#521851) Patch from Josselin Mouette svn path=/trunk/; revision=6710 --- gio/ChangeLog | 7 +++++++ gio/gunixmounts.c | 21 ++------------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index b94f57b..d566ed7 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,5 +1,12 @@ 2008-03-14 Alexander Larsson + * gunixmounts.c: + (guess_mount_type): + Avoid redudant tests (#521851) + Patch from Josselin Mouette + +2008-03-14 Alexander Larsson + * gfilemonitor.c: (g_file_monitor_is_cancelled): Fix C89 issue (#521672) diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index 486a21b..cc7090d 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -1598,27 +1598,10 @@ guess_mount_type (const char *mount_path, { basename = g_path_get_basename (mount_path); - if (g_str_has_prefix (basename, "cdrom") || + if (g_str_has_prefix (basename, "cdr") || g_str_has_prefix (basename, "cdwriter") || g_str_has_prefix (basename, "burn") || - g_str_has_prefix (basename, "cdr") || - g_str_has_prefix (basename, "cdrw") || - g_str_has_prefix (basename, "dvdrom") || - g_str_has_prefix (basename, "dvdram") || - g_str_has_prefix (basename, "dvdr") || - g_str_has_prefix (basename, "dvdrw") || - g_str_has_prefix (basename, "cdrom_dvdrom") || - g_str_has_prefix (basename, "cdrom_dvdram") || - g_str_has_prefix (basename, "cdrom_dvdr") || - g_str_has_prefix (basename, "cdrom_dvdrw") || - g_str_has_prefix (basename, "cdr_dvdrom") || - g_str_has_prefix (basename, "cdr_dvdram") || - g_str_has_prefix (basename, "cdr_dvdr") || - g_str_has_prefix (basename, "cdr_dvdrw") || - g_str_has_prefix (basename, "cdrw_dvdrom") || - g_str_has_prefix (basename, "cdrw_dvdram") || - g_str_has_prefix (basename, "cdrw_dvdr") || - g_str_has_prefix (basename, "cdrw_dvdrw")) + g_str_has_prefix (basename, "dvdr")) type = G_UNIX_MOUNT_TYPE_CDROM; else if (g_str_has_prefix (basename, "floppy")) type = G_UNIX_MOUNT_TYPE_FLOPPY; -- 2.7.4