[glib] Rename g_socket_check_pending_error to g_socket_check_connect_result
- From: Alexander Larsson <alexl src gnome org>
- To: svn-commits-list gnome org
- Subject: [glib] Rename g_socket_check_pending_error to g_socket_check_connect_result
- Date: Tue, 19 May 2009 09:31:58 -0400 (EDT)
commit e1a4389cbc549b0db39ec692f2fde5c20579362c
Author: Alexander Larsson <alexl redhat com>
Date: Tue May 19 10:57:58 2009 +0200
Rename g_socket_check_pending_error to g_socket_check_connect_result
This is only used for connect anyway, and this describes the operation
better.
---
docs/reference/gio/gio-sections.txt | 2 +-
gio/gio.symbols | 2 +-
gio/gsocket.c | 12 ++++++------
gio/gsocket.h | 2 +-
gio/gsocketclient.c | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index d4c8962..155a868 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -1638,7 +1638,7 @@ g_socket_bind
g_socket_listen
g_socket_accept
g_socket_connect
-g_socket_check_pending_error
+g_socket_check_connect_result
g_socket_receive
g_socket_receive_from
g_socket_receive_message
diff --git a/gio/gio.symbols b/gio/gio.symbols
index 48561b6..454440b 100644
--- a/gio/gio.symbols
+++ b/gio/gio.symbols
@@ -1065,7 +1065,7 @@ g_initable_new_valist
g_socket_get_type G_GNUC_CONST
g_socket_accept
g_socket_bind
-g_socket_check_pending_error
+g_socket_check_connect_result
g_socket_close
g_socket_condition_check
g_socket_condition_wait
diff --git a/gio/gsocket.c b/gio/gsocket.c
index b17f09f..d7e6ea2 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -1472,7 +1472,7 @@ g_socket_accept (GSocket *socket,
* non-blocking I/O is enabled. Then %G_IO_ERROR_PENDING is returned
* and the user can be notified of the connection finishing by waiting
* for the G_IO_OUT condition. The result of the connection can then be
- * checked with g_socket_check_pending_error().
+ * checked with g_socket_check_connect_result().
*
* Returns: %TRUE if connected, %FALSE on error.
*
@@ -1517,7 +1517,7 @@ g_socket_connect (GSocket *socket,
if (socket->priv->blocking)
{
g_socket_condition_wait (socket, G_IO_OUT, NULL, NULL);
- if (g_socket_check_pending_error (socket, error))
+ if (g_socket_check_connect_result (socket, error))
break;
else
g_prefix_error (error, _("Error connecting: "));
@@ -1544,11 +1544,11 @@ g_socket_connect (GSocket *socket,
}
/**
- * g_socket_check_pending_error:
+ * g_socket_check_connect_result:
* @socket: a #GSocket
* @error: #GError for error reporting, or %NULL to ignore.
*
- * Checks and resets the pending error for the socket. This is typically
+ * Checks and resets the pending connect error for the socket. This is
* used to check for errors when g_socket_connect() is used in non-blocking mode.
*
* Returns: %TRUE if no error, %FALSE otherwise, setting @error to the error
@@ -1556,8 +1556,8 @@ g_socket_connect (GSocket *socket,
* Since: 2.22
**/
gboolean
-g_socket_check_pending_error (GSocket *socket,
- GError **error)
+g_socket_check_connect_result (GSocket *socket,
+ GError **error)
{
guint optlen;
int value;
diff --git a/gio/gsocket.h b/gio/gsocket.h
index b43167d..207f168 100644
--- a/gio/gsocket.h
+++ b/gio/gsocket.h
@@ -106,7 +106,7 @@ gboolean g_socket_bind (GSocket
gboolean g_socket_connect (GSocket *socket,
GSocketAddress *address,
GError **error);
-gboolean g_socket_check_pending_error (GSocket *socket,
+gboolean g_socket_check_connect_result (GSocket *socket,
GError **error);
GIOCondition g_socket_condition_check (GSocket *socket,
GIOCondition condition);
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index ddb1383..9224793 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -671,7 +671,7 @@ g_socket_client_socket_callback (GSocket *socket,
else
{
/* socket is ready for writing means connect done, did it succeed? */
- if (!g_socket_check_pending_error (data->current_socket, &error))
+ if (!g_socket_check_connect_result (data->current_socket, &error))
{
set_last_error (data, error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]