[glib] Remove an erroneous check in the non-sendmmsg() version of g_socket_send_messages()
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Remove an erroneous check in the non-sendmmsg() version of g_socket_send_messages()
- Date: Tue, 12 Jul 2016 13:14:36 +0000 (UTC)
commit e0bb25c2149e4b89f75e1a095c61e76ac4ad3a05
Author: Dan Winship <danw gnome org>
Date: Mon Jul 11 17:46:41 2016 -0400
Remove an erroneous check in the non-sendmmsg() version of g_socket_send_messages()
The docs specify that *all* errors are ignored if we managed to send
any data successfully, not just timeout/wouldblock.
https://bugzilla.gnome.org/show_bug.cgi?id=768549
gio/gsocket.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 4961f6f..cb7c81b 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -4662,9 +4662,7 @@ g_socket_send_messages_with_timeout (GSocket *socket,
{
/* if we couldn't send all messages, just return how many we did
* manage to send, provided we managed to send at least one */
- if (i > 0 &&
- (g_error_matches (msg_error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK) ||
- g_error_matches (msg_error, G_IO_ERROR, G_IO_ERROR_TIMED_OUT)))
+ if (i > 0)
{
g_error_free (msg_error);
return i;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]