[glib] gsocket: Fix some cases of returning error without setting *error
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gsocket: Fix some cases of returning error without setting *error
- Date: Sat, 28 May 2011 23:47:35 +0000 (UTC)
commit 2df4750aceec5f774a413f3f8ee7ccaabc5c8880
Author: Neil Roberts <neil linux intel com>
Date: Sat May 28 15:13:11 2011 +0100
gsocket: Fix some cases of returning error without setting *error
g_socket_shutdown and g_socket_close were calling check_socket with a
NULL error parameter so any errors wouldn't get propagated up.
https://bugzilla.gnome.org/show_bug.cgi?id=651327
gio/gsocket.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 13552f9..c2f5107 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -2109,7 +2109,7 @@ g_socket_shutdown (GSocket *socket,
g_return_val_if_fail (G_IS_SOCKET (socket), TRUE);
- if (!check_socket (socket, NULL))
+ if (!check_socket (socket, error))
return FALSE;
/* Do nothing? */
@@ -2196,7 +2196,7 @@ g_socket_close (GSocket *socket,
if (socket->priv->closed)
return TRUE; /* Multiple close not an error */
- if (!check_socket (socket, NULL))
+ if (!check_socket (socket, error))
return FALSE;
while (1)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]