diff options
| author | Christian Persch <chpe@gnome.org> | 2008-05-27 23:44:35 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2009-05-29 01:16:12 -0400 |
| commit | eb6c59bc48ccec382925ffc3b32e5bfa1e0479b7 (patch) | |
| tree | ba40444c036e90c760c3f0693c3e1d43e7dd0aa8 | |
| parent | faeeebab030eee4610b41303754e44dc89239450 (diff) | |
| download | glib-eb6c59bc48ccec382925ffc3b32e5bfa1e0479b7.tar.gz | |
Preserve errno when using g_set_error with _() and g_strerror()
| -rw-r--r-- | gio/glocalfileoutputstream.c | 2 | ||||
| -rw-r--r-- | glib/gspawn.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c index 7c73da481..354ee32bc 100644 --- a/gio/glocalfileoutputstream.c +++ b/gio/glocalfileoutputstream.c @@ -291,7 +291,7 @@ g_local_file_output_stream_close (GOutputStream *stream, int errsv = errno; g_set_error (error, G_IO_ERROR, - g_io_error_from_errno (errno), + g_io_error_from_errno (errsv), _("Error renaming temporary file: %s"), g_strerror (errsv)); goto err_out; diff --git a/glib/gspawn.c b/glib/gspawn.c index b56633143..406ef2b4b 100644 --- a/glib/gspawn.c +++ b/glib/gspawn.c @@ -1462,11 +1462,12 @@ make_pipe (gint p[2], { if (pipe (p) < 0) { + gint errsv = errno; g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED, _("Failed to create pipe for communicating with child process (%s)"), - g_strerror (errno)); + g_strerror (errsv)); return FALSE; } else |