libgsf r967 - in trunk: . gsf-gvfs

[doml svn gnome org]

Author: doml
Date: Fri Mar 14 19:27:24 2008
New Revision: 967
URL: http://svn.gnome.org/viewvc/libgsf?rev=967&view=rev

Log:
2008-03-14  Dominic Lachowicz <domlachowicz gmail com>

        * gsf-gvfs/gsf-input-gvfs.c:
        * gsf-gvfs/gsf-output-gvfs.c: g_file_new() functions cannot fail



Modified:
   trunk/ChangeLog
   trunk/gsf-gvfs/gsf-input-gvfs.c
   trunk/gsf-gvfs/gsf-output-gvfs.c

Modified: trunk/gsf-gvfs/gsf-input-gvfs.c
==============================================================================
--- trunk/gsf-gvfs/gsf-input-gvfs.c	(original)
+++ trunk/gsf-gvfs/gsf-input-gvfs.c	Fri Mar 14 19:27:24 2008
@@ -154,6 +154,7 @@
 gsf_input_gvfs_new_for_path (char const *path, GError **err)
 {
 	GFile *file;
+	GsfInput *input;
 
 	if (path == NULL) {
 		if (err != NULL)
@@ -163,25 +164,18 @@
 	}
 
 	file = g_file_new_for_path (path);
-	if (file != NULL) {
-		GsfInput *input;
 
-		input = gsf_input_gvfs_new (file, err);
-		g_object_unref (G_OBJECT (file));
-
-		return input;
-	}
-
-	if (err != NULL)
-		*err = g_error_new (gsf_input_error_id (), 0,
-				    "couldn't open file");
-	return NULL;
+	input = gsf_input_gvfs_new (file, err);
+	g_object_unref (G_OBJECT (file));
+	
+	return input;
 }
 
 GsfInput *
 gsf_input_gvfs_new_for_uri (char const *uri, GError **err)
 {
 	GFile *file;
+	GsfInput *input;
 
 	if (uri == NULL) {
 		if (err != NULL)
@@ -191,19 +185,11 @@
 	}
 
 	file = g_file_new_for_uri (uri);
-	if (file != NULL) {
-		GsfInput *input;
 
-		input = gsf_input_gvfs_new (file, err);
-		g_object_unref (G_OBJECT (file));
-
-		return input;
-	}
-
-	if (err != NULL)
-		*err = g_error_new (gsf_input_error_id (), 0,
-				    "couldn't open file");
-	return NULL;
+	input = gsf_input_gvfs_new (file, err);
+	g_object_unref (G_OBJECT (file));
+	
+	return input;
 }
 
 static void

Modified: trunk/gsf-gvfs/gsf-output-gvfs.c
==============================================================================
--- trunk/gsf-gvfs/gsf-output-gvfs.c	(original)
+++ trunk/gsf-gvfs/gsf-output-gvfs.c	Fri Mar 14 19:27:24 2008
@@ -85,6 +85,7 @@
 gsf_output_gvfs_new_for_path (char const *path, GError **err)
 {
 	GFile *file;
+	GsfOutput *output;
 
 	if (path == NULL) {
 		if (err != NULL)
@@ -94,25 +95,18 @@
 	}
 
 	file = g_file_new_for_path (path);
-	if (file != NULL) {
-		GsfOutput *output;
 
-		output = gsf_output_gvfs_new (file);
-		g_object_unref (G_OBJECT (file));
-
-		return output;
-	}
-
-	if (err != NULL)
-		*err = g_error_new (gsf_output_error_id (), 0,
-				    "couldn't open file");
-	return NULL;
+	output = gsf_output_gvfs_new (file);
+	g_object_unref (G_OBJECT (file));
+	
+	return output;
 }
 
 GsfOutput *
 gsf_output_gvfs_new_for_uri (char const *uri, GError **err)
 {
 	GFile *file;
+	GsfOutput *output;
 
 	if (uri == NULL) {
 		if (err != NULL)
@@ -122,19 +116,11 @@
 	}
 
 	file = g_file_new_for_uri (uri);
-	if (file != NULL) {
-		GsfOutput *output;
 
-		output = gsf_output_gvfs_new (file);
-		g_object_unref (G_OBJECT (file));
-
-		return output;
-	}
-
-	if (err != NULL)
-		*err = g_error_new (gsf_output_error_id (), 0,
-				    "couldn't open file");
-	return NULL;
+	output = gsf_output_gvfs_new (file);
+	g_object_unref (G_OBJECT (file));
+	
+	return output;
 }
 
 static gboolean