Invalid parent-URI disk image is no longer assertion-fatal.

diff --git a/src/gnome-vfs-method.c b/src/gnome-vfs-method.c
index 21e97c2..9e72039 100644 (file)
--- a/src/gnome-vfs-method.c
+++ b/src/gnome-vfs-method.c
@@ -236,8 +236,8 @@ struct libntfs_directory *libntfs_directory;
        g_return_val_if_fail(method==&GnomeVFSMethod_static,GNOME_VFS_ERROR_BAD_PARAMETERS);
        g_return_val_if_fail(method_handle!=NULL,GNOME_VFS_ERROR_BAD_PARAMETERS);
 
-       errvfsresult=libntfs_gnomevfs_uri_parent_init(&volume,uri);
-       g_return_val_if_fail(errvfsresult==GNOME_VFS_OK,errvfsresult);
+       if (GNOME_VFS_OK!=(errvfsresult=libntfs_gnomevfs_uri_parent_init(&volume,uri)))
+               return errvfsresult;
 
        if (GNOME_VFS_OK!=(errvfsresult=inode_open_by_pathname(&inode,volume,uri->text)))
                return errvfsresult;
@@ -407,8 +407,8 @@ struct libntfs_file *libntfs_file;
        g_return_val_if_fail(method==&GnomeVFSMethod_static,GNOME_VFS_ERROR_BAD_PARAMETERS);
        g_return_val_if_fail(method_handle_return!=NULL,GNOME_VFS_ERROR_BAD_PARAMETERS);
 
-       errvfsresult=libntfs_gnomevfs_uri_parent_init(&volume,uri);
-       g_return_val_if_fail(errvfsresult==GNOME_VFS_OK,errvfsresult);
+       if (GNOME_VFS_OK!=(errvfsresult=libntfs_gnomevfs_uri_parent_init(&volume,uri)))
+               return errvfsresult;
 
        if (mode & GNOME_VFS_OPEN_WRITE)
                return GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM;
@@ -435,8 +435,8 @@ ntfs_volume *volume;
        g_return_val_if_fail(method==&GnomeVFSMethod_static,GNOME_VFS_ERROR_BAD_PARAMETERS);
        g_return_val_if_fail(method_handle_return!=NULL,GNOME_VFS_ERROR_BAD_PARAMETERS);
 
-       errvfsresult=libntfs_gnomevfs_uri_parent_init(&volume,uri);
-       g_return_val_if_fail(errvfsresult==GNOME_VFS_OK,errvfsresult);
+       if (GNOME_VFS_OK!=(errvfsresult=libntfs_gnomevfs_uri_parent_init(&volume,uri)))
+               return errvfsresult;
 
        return GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM;
 }