luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

g_file_make_directory_with_parents: clean up logic

Browse Source 
Simplify logic by only looking at whether we have a GError and
not also using return codes.

https://bugzilla.gnome.org/show_bug.cgi?id=680823
This commit is contained in:
Owen W. Taylor 2012-08-14 11:25:56 -04:00 committed by Matthias Clasen
parent 5291190f46
commit f899358156
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gio/gfile.c
View File

@ -3360,7 +3360,6 @@ g_file_make_directory_with_parents (GFile *file,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean result;
GFile *work_file = NULL; GFile *work_file = NULL;
GList *list = NULL, *l; GList *list = NULL, *l;
GError *my_error = NULL; GError *my_error = NULL;
@ -3370,17 +3369,17 @@ g_file_make_directory_with_parents (GFile *file,
if (g_cancellable_set_error_if_cancelled (cancellable, error)) if (g_cancellable_set_error_if_cancelled (cancellable, error))
return FALSE; return FALSE;
result = g_file_make_directory (file, cancellable, &my_error); g_file_make_directory (file, cancellable, &my_error);
if (result || my_error->code != G_IO_ERROR_NOT_FOUND) if (my_error == NULL || my_error->code != G_IO_ERROR_NOT_FOUND)
{ {
if (my_error) if (my_error)
g_propagate_error (error, my_error); g_propagate_error (error, my_error);
return result; return my_error == NULL;
} }
work_file = g_object_ref (file); work_file = g_object_ref (file);
while (!result && my_error->code == G_IO_ERROR_NOT_FOUND) while (my_error != NULL && my_error->code == G_IO_ERROR_NOT_FOUND)
{ {
GFile *parent_file; GFile *parent_file;
@ -3389,21 +3388,20 @@ g_file_make_directory_with_parents (GFile *file,
break; break;
g_clear_error (&my_error); g_clear_error (&my_error);
g_file_make_directory (parent_file, cancellable, &my_error);
result = g_file_make_directory (parent_file, cancellable, &my_error);
g_object_unref (work_file); g_object_unref (work_file);
work_file = g_object_ref (parent_file); work_file = g_object_ref (parent_file);
if (!result && my_error->code == G_IO_ERROR_NOT_FOUND) if (my_error != NULL && my_error->code == G_IO_ERROR_NOT_FOUND)
list = g_list_prepend (list, parent_file); /* Transfer ownership of ref */ list = g_list_prepend (list, parent_file); /* Transfer ownership of ref */
else else
g_object_unref (parent_file); g_object_unref (parent_file);
} }
for (l = list; result && l; l = l->next) for (l = list; my_error == NULL && l; l = l->next)
{ {
result = g_file_make_directory ((GFile *) l->data, cancellable, &my_error); g_file_make_directory ((GFile *) l->data, cancellable, &my_error);
} }
if (work_file) if (work_file)
@ -3416,10 +3414,10 @@ g_file_make_directory_with_parents (GFile *file,
list = g_list_remove (list, list->data); list = g_list_remove (list, list->data);
} }
if (!result) if (my_error != NULL)
{ {
g_propagate_error (error, my_error); g_propagate_error (error, my_error);
return result; return FALSE;
} }
return g_file_make_directory (file, cancellable, error); return g_file_make_directory (file, cancellable, error);