luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 23:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 555309 – giochannel breaks on error Patch from Christian Persch

Browse Source 
2008-10-06  Behdad Esfahbod  <behdad@gnome.org>

        Bug 555309 – giochannel breaks on error
        Patch from Christian Persch

        * glib/giounix.c (g_io_unix_read), (g_io_unix_write),
        (g_io_unix_seek), (g_io_unix_close), (g_io_unix_set_flags):
        Don't shadow err.  Oops!


svn path=/trunk/; revision=7574
This commit is contained in:
Behdad Esfahbod 2008-10-06 22:57:49 +00:00 committed by Behdad Esfahbod
parent b383c8f08f
commit af866931b6
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-10-06 Behdad Esfahbod <behdad@gnome.org>
Bug 555309 – giochannel breaks on error
Patch from Christian Persch
* glib/giounix.c (g_io_unix_read), (g_io_unix_write),
(g_io_unix_seek), (g_io_unix_close), (g_io_unix_set_flags):
Don't shadow err. Oops!
2008-10-06 Christophe Fergeau <teuf@gnome.org> 2008-10-06 Christophe Fergeau <teuf@gnome.org>
Bug 555224 – Improve g_format_size_for_display doc Bug 555224 – Improve g_format_size_for_display doc

34
glib/giounix.c
View File

@ -190,10 +190,10 @@ g_io_unix_read (GIOChannel *channel,
if (result < 0) if (result < 0)
{ {
int err = errno; int errsv = errno;
*bytes_read = 0; *bytes_read = 0;
switch (err) switch (errsv)
{ {
#ifdef EINTR #ifdef EINTR
case EINTR: case EINTR:
@ -205,8 +205,8 @@ g_io_unix_read (GIOChannel *channel,
#endif #endif
default: default:
g_set_error_literal (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (err), g_io_channel_error_from_errno (errsv),
g_strerror (err)); g_strerror (errsv));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
} }
@ -231,10 +231,10 @@ g_io_unix_write (GIOChannel *channel,
if (result < 0) if (result < 0)
{ {
int err = errno; int errsv = errno;
*bytes_written = 0; *bytes_written = 0;
switch (err) switch (errsv)
{ {
#ifdef EINTR #ifdef EINTR
case EINTR: case EINTR:
@ -246,8 +246,8 @@ g_io_unix_write (GIOChannel *channel,
#endif #endif
default: default:
g_set_error_literal (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (err), g_io_channel_error_from_errno (errsv),
g_strerror (err)); g_strerror (errsv));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
} }
@ -297,10 +297,10 @@ g_io_unix_seek (GIOChannel *channel,
if (result < 0) if (result < 0)
{ {
int err = errno; int errsv = errno;
g_set_error_literal (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (err), g_io_channel_error_from_errno (errsv),
g_strerror (err)); g_strerror (errsv));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -316,10 +316,10 @@ g_io_unix_close (GIOChannel *channel,
if (close (unix_channel->fd) < 0) if (close (unix_channel->fd) < 0)
{ {
int err = errno; int errsv = errno;
g_set_error_literal (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (err), g_io_channel_error_from_errno (errsv),
g_strerror (err)); g_strerror (errsv));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }
@ -380,10 +380,10 @@ g_io_unix_set_flags (GIOChannel *channel,
if (fcntl (unix_channel->fd, F_SETFL, fcntl_flags) == -1) if (fcntl (unix_channel->fd, F_SETFL, fcntl_flags) == -1)
{ {
int err = errno; int errsv = errno;
g_set_error_literal (err, G_IO_CHANNEL_ERROR, g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (err), g_io_channel_error_from_errno (errsv),
g_strerror (err)); g_strerror (errsv));
return G_IO_STATUS_ERROR; return G_IO_STATUS_ERROR;
} }