luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 14:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

GLocalFileOutputStream: Further deduplicate error code path

Browse Source 
Just code cleanup.

https://bugzilla.gnome.org/699959
This commit is contained in:
Colin Walters 2013-05-09 18:47:50 +01:00
parent 5e65cd4e51
commit 7fc2ab9493
1 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gio/glocalfileoutputstream.c
View File

@ -544,18 +544,9 @@ _g_local_file_output_stream_new (int fd)
return G_FILE_OUTPUT_STREAM (stream); return G_FILE_OUTPUT_STREAM (stream);
} }
static GFileOutputStream * static void
output_stream_open (const char *filename, set_error_from_open_errno (const char *filename,
gint open_flags,
guint mode,
GCancellable *cancellable,
GError **error) GError **error)
{
GLocalFileOutputStream *stream;
gint fd;
fd = g_open (filename, open_flags, mode);
if (fd == -1)
{ {
int errsv = errno; int errsv = errno;
@ -573,6 +564,22 @@ output_stream_open (const char *filename,
display_name, g_strerror (errsv)); display_name, g_strerror (errsv));
g_free (display_name); g_free (display_name);
} }
}
static GFileOutputStream *
output_stream_open (const char *filename,
gint open_flags,
guint mode,
GCancellable *cancellable,
GError **error)
{
GLocalFileOutputStream *stream;
gint fd;
fd = g_open (filename, open_flags, mode);
if (fd == -1)
{
set_error_from_open_errno (filename, error);
return NULL; return NULL;
} }
@ -1111,22 +1118,7 @@ _g_local_file_output_stream_replace (const char *filename,
} }
else if (fd == -1) else if (fd == -1)
{ {
int errsv = errno; set_error_from_open_errno (filename, error);
if (errsv == EINVAL)
/* This must be an invalid filename, on e.g. FAT */
g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_INVALID_FILENAME,
_("Invalid filename"));
else
{
char *display_name = g_filename_display_name (filename);
g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv),
_("Error opening file '%s': %s"),
display_name, g_strerror (errsv));
g_free (display_name);
}
return NULL; return NULL;
} }