[glib] GSocket: clarify g_socket_receive documentation
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] GSocket: clarify g_socket_receive documentation
- Date: Sat, 9 Apr 2011 16:54:32 +0000 (UTC)
commit 61704dbca5a0004ab9b1172cd96b8d81b1697d61
Author: Dan Winship <danw gnome org>
Date: Sat Apr 9 12:47:32 2011 -0400
GSocket: clarify g_socket_receive documentation
g_socket_receive* return 0 if the connection is closed.
https://bugzilla.gnome.org/show_bug.cgi?id=643074
gio/gsocket.c | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index aa0a39c..d0219c1 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -1756,15 +1756,17 @@ g_socket_check_connect_result (GSocket *socket,
* received, the additional data will be returned in future calls to
* g_socket_receive().
*
- * If the socket is in blocking mode the call will block until there is
- * some data to receive or there is an error. If there is no data available
- * and the socket is in non-blocking mode, a %G_IO_ERROR_WOULD_BLOCK error
- * will be returned. To be notified when data is available, wait for the
+ * If the socket is in blocking mode the call will block until there
+ * is some data to receive, the connection is closed, or there is an
+ * error. If there is no data available and the socket is in
+ * non-blocking mode, a %G_IO_ERROR_WOULD_BLOCK error will be
+ * returned. To be notified when data is available, wait for the
* %G_IO_IN condition.
*
* On error -1 is returned and @error is set accordingly.
*
- * Returns: Number of bytes read, or -1 on error
+ * Returns: Number of bytes read, or 0 if the connection was closed by
+ * the peer, or -1 on error
*
* Since: 2.22
*/
@@ -1794,7 +1796,8 @@ g_socket_receive (GSocket *socket,
* the choice of blocking or non-blocking behavior is determined by
* the @blocking argument rather than by @socket's properties.
*
- * Returns: Number of bytes read, or -1 on error
+ * Returns: Number of bytes read, or 0 if the connection was closed by
+ * the peer, or -1 on error
*
* Since: 2.26
*/
@@ -1876,7 +1879,8 @@ g_socket_receive_with_blocking (GSocket *socket,
*
* See g_socket_receive() for additional information.
*
- * Returns: Number of bytes read, or -1 on error
+ * Returns: Number of bytes read, or 0 if the connection was closed by
+ * the peer, or -1 on error
*
* Since: 2.22
*/
@@ -3182,14 +3186,16 @@ g_socket_send_message (GSocket *socket,
* sufficiently-large buffer.
*
* If the socket is in blocking mode the call will block until there
- * is some data to receive or there is an error. If there is no data
- * available and the socket is in non-blocking mode, a
- * %G_IO_ERROR_WOULD_BLOCK error will be returned. To be notified when
- * data is available, wait for the %G_IO_IN condition.
+ * is some data to receive, the connection is closed, or there is an
+ * error. If there is no data available and the socket is in
+ * non-blocking mode, a %G_IO_ERROR_WOULD_BLOCK error will be
+ * returned. To be notified when data is available, wait for the
+ * %G_IO_IN condition.
*
* On error -1 is returned and @error is set accordingly.
*
- * Returns: Number of bytes read, or -1 on error
+ * Returns: Number of bytes read, or 0 if the connection was closed by
+ * the peer, or -1 on error
*
* Since: 2.22
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]