luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid redudant tests (#521851) Patch from Josselin Mouette

Browse Source 
2008-03-14  Alexander Larsson  <alexl@redhat.com>

        * gunixmounts.c:
        (guess_mount_type):
	Avoid redudant tests (#521851)
	Patch from Josselin Mouette


svn path=/trunk/; revision=6710
This commit is contained in:
Alexander Larsson
2008-03-14 11:15:49 +00:00
committed by Alexander Larsson
parent 6088f22d26
commit 240ba02786
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gio/ChangeLog
View File

@@ -1,3 +1,10 @@
2008-03-14 Alexander Larsson <alexl@redhat.com>
* gunixmounts.c:
(guess_mount_type):
Avoid redudant tests (#521851)
Patch from Josselin Mouette
2008-03-14 Alexander Larsson <alexl@redhat.com> 2008-03-14 Alexander Larsson <alexl@redhat.com>
* gfilemonitor.c: * gfilemonitor.c:

21
gio/gunixmounts.c
View File

@@ -1598,27 +1598,10 @@ guess_mount_type (const char *mount_path,
{ {
basename = g_path_get_basename (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, "cdwriter") ||
g_str_has_prefix (basename, "burn") || g_str_has_prefix (basename, "burn") ||
g_str_has_prefix (basename, "cdr") || g_str_has_prefix (basename, "dvdr"))
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"))
type = G_UNIX_MOUNT_TYPE_CDROM; type = G_UNIX_MOUNT_TYPE_CDROM;
else if (g_str_has_prefix (basename, "floppy")) else if (g_str_has_prefix (basename, "floppy"))
type = G_UNIX_MOUNT_TYPE_FLOPPY; type = G_UNIX_MOUNT_TYPE_FLOPPY;