projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c2f670e
)
docs: fix typos in networking classes
author
Thomas Hindoe Paaboel Andersen
<phomes@gmail.com>
Wed, 20 Apr 2011 17:08:06 +0000
(19:08 +0200)
committer
Thomas Hindoe Paaboel Andersen
<phomes@gmail.com>
Wed, 20 Apr 2011 19:08:15 +0000
(21:08 +0200)
gio/gsocketclient.c
patch
|
blob
|
history
gio/gsocketconnection.c
patch
|
blob
|
history
gio/gsocketlistener.c
patch
|
blob
|
history
gio/gsocketservice.c
patch
|
blob
|
history
gio/gtcpconnection.c
patch
|
blob
|
history
gio/gthreadedsocketservice.c
patch
|
blob
|
history
gio/gunixconnection.c
patch
|
blob
|
history
diff --git
a/gio/gsocketclient.c
b/gio/gsocketclient.c
index
bb60fcc
..
0519346
100644
(file)
--- a/
gio/gsocketclient.c
+++ b/
gio/gsocketclient.c
@@
-58,7
+58,7
@@
* #GSocketClient is a high-level utility class for connecting to a
* network host using a connection oriented socket type.
*
* #GSocketClient is a high-level utility class for connecting to a
* network host using a connection oriented socket type.
*
- * You create a #GSocketClient object, set any options you want, then
+ * You create a #GSocketClient object, set any options you want,
and
then
* call a sync or async connect operation, which returns a #GSocketConnection
* subclass on success.
*
* call a sync or async connect operation, which returns a #GSocketConnection
* subclass on success.
*
@@
-442,7
+442,7
@@
g_socket_client_get_local_address (GSocketClient *client)
* The sockets created by this object will bound to the
* specified address (if not %NULL) before connecting.
*
* The sockets created by this object will bound to the
* specified address (if not %NULL) before connecting.
*
- * This is useful if you want to ensure th
e
the local
+ * This is useful if you want to ensure th
at
the local
* side of the connection is on a specific port, or on
* a specific interface.
*
* side of the connection is on a specific port, or on
* a specific interface.
*
@@
-726,7
+726,7
@@
g_socket_client_class_init (GSocketClientClass *class)
* @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting, or %NULL to ignore.
*
* @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
* @error: #GError for error reporting, or %NULL to ignore.
*
- * Tries to resolve the @connectable and make a network connection to it.
.
+ * Tries to resolve the @connectable and make a network connection to it.
*
* Upon a successful connection, a new #GSocketConnection is constructed
* and returned. The caller owns this new object and must drop their
*
* Upon a successful connection, a new #GSocketConnection is constructed
* and returned. The caller owns this new object and must drop their
@@
-736,7
+736,7
@@
g_socket_client_class_init (GSocketClientClass *class)
* the underlying socket that is used. For instance, for a TCP/IP connection
* it will be a #GTcpConnection.
*
* the underlying socket that is used. For instance, for a TCP/IP connection
* it will be a #GTcpConnection.
*
- * The socket created will be the same family as the
the
address that the
+ * The socket created will be the same family as the address that the
* @connectable resolves to, unless family is set with g_socket_client_set_family()
* or indirectly via g_socket_client_set_local_address(). The socket type
* defaults to %G_SOCKET_TYPE_STREAM but can be set with
* @connectable resolves to, unless family is set with g_socket_client_set_family()
* or indirectly via g_socket_client_set_local_address(). The socket type
* defaults to %G_SOCKET_TYPE_STREAM but can be set with
@@
-912,7
+912,7
@@
g_socket_client_connect (GSocketClient *client,
*
* Attempts to create a TCP connection to the named host.
*
*
* Attempts to create a TCP connection to the named host.
*
- * @host_and_port may be in any of a number of recogni
s
ed formats; an IPv6
+ * @host_and_port may be in any of a number of recogni
z
ed formats; an IPv6
* address, an IPv4 address, or a domain name (in which case a DNS
* lookup is performed). Quoting with [] is supported for all address
* types. A port override may be specified in the usual way with a
* address, an IPv4 address, or a domain name (in which case a DNS
* lookup is performed). Quoting with [] is supported for all address
* types. A port override may be specified in the usual way with a
@@
-923,7
+923,7
@@
g_socket_client_connect (GSocketClient *client,
* used as the port number to connect to.
*
* In general, @host_and_port is expected to be provided by the user (allowing
* used as the port number to connect to.
*
* In general, @host_and_port is expected to be provided by the user (allowing
- * them to give the hostname, and a port overide if necessary) and
+ * them to give the hostname, and a port over
r
ide if necessary) and
* @default_port is expected to be provided by the application.
*
* In the case that an IP address is given, a single connection
* @default_port is expected to be provided by the application.
*
* In the case that an IP address is given, a single connection
@@
-1591,7
+1591,7
@@
g_socket_client_connect_to_uri_async (GSocketClient *client,
* g_socket_client_connect_finish:
* @client: a #GSocketClient.
* @result: a #GAsyncResult.
* g_socket_client_connect_finish:
* @client: a #GSocketClient.
* @result: a #GAsyncResult.
- * @error: a #GError location to store the error occuring, or %NULL to
+ * @error: a #GError location to store the error occur
r
ing, or %NULL to
* ignore.
*
* Finishes an async connect operation. See g_socket_client_connect_async()
* ignore.
*
* Finishes an async connect operation. See g_socket_client_connect_async()
@@
-1617,7
+1617,7
@@
g_socket_client_connect_finish (GSocketClient *client,
* g_socket_client_connect_to_host_finish:
* @client: a #GSocketClient.
* @result: a #GAsyncResult.
* g_socket_client_connect_to_host_finish:
* @client: a #GSocketClient.
* @result: a #GAsyncResult.
- * @error: a #GError location to store the error occuring, or %NULL to
+ * @error: a #GError location to store the error occur
r
ing, or %NULL to
* ignore.
*
* Finishes an async connect operation. See g_socket_client_connect_to_host_async()
* ignore.
*
* Finishes an async connect operation. See g_socket_client_connect_to_host_async()
@@
-1638,7
+1638,7
@@
g_socket_client_connect_to_host_finish (GSocketClient *client,
* g_socket_client_connect_to_service_finish:
* @client: a #GSocketClient.
* @result: a #GAsyncResult.
* g_socket_client_connect_to_service_finish:
* @client: a #GSocketClient.
* @result: a #GAsyncResult.
- * @error: a #GError location to store the error occuring, or %NULL to
+ * @error: a #GError location to store the error occur
r
ing, or %NULL to
* ignore.
*
* Finishes an async connect operation. See g_socket_client_connect_to_service_async()
* ignore.
*
* Finishes an async connect operation. See g_socket_client_connect_to_service_async()
@@
-1659,7
+1659,7
@@
g_socket_client_connect_to_service_finish (GSocketClient *client,
* g_socket_client_connect_to_uri_finish:
* @client: a #GSocketClient.
* @result: a #GAsyncResult.
* g_socket_client_connect_to_uri_finish:
* @client: a #GSocketClient.
* @result: a #GAsyncResult.
- * @error: a #GError location to store the error occuring, or %NULL to
+ * @error: a #GError location to store the error occur
r
ing, or %NULL to
* ignore.
*
* Finishes an async connect operation. See g_socket_client_connect_to_uri_async()
* ignore.
*
* Finishes an async connect operation. See g_socket_client_connect_to_uri_async()
@@
-1684,7
+1684,7
@@
g_socket_client_connect_to_uri_finish (GSocketClient *client,
* Enable proxy protocols to be handled by the application. When the
* indicated proxy protocol is returned by the #GProxyResolver,
* #GSocketClient will consider this protocol as supported but will
* Enable proxy protocols to be handled by the application. When the
* indicated proxy protocol is returned by the #GProxyResolver,
* #GSocketClient will consider this protocol as supported but will
- * not try find a #GProxy instance to handle handshaking. The
+ * not try
to
find a #GProxy instance to handle handshaking. The
* application must check for this case by calling
* g_socket_connection_get_remote_address() on the returned
* #GSocketConnection, and seeing if it's a #GProxyAddress of the
* application must check for this case by calling
* g_socket_connection_get_remote_address() on the returned
* #GSocketConnection, and seeing if it's a #GProxyAddress of the
diff --git
a/gio/gsocketconnection.c
b/gio/gsocketconnection.c
index
ac9ce74
..
6f2f102
100644
(file)
--- a/
gio/gsocketconnection.c
+++ b/
gio/gsocketconnection.c
@@
-52,7
+52,7
@@
* depends on the type of the underlying socket that is in use. For
* instance, for a TCP/IP connection it will be a #GTcpConnection.
*
* depends on the type of the underlying socket that is in use. For
* instance, for a TCP/IP connection it will be a #GTcpConnection.
*
- * Chosing what type of object to construct is done with the socket
+ * Cho
o
sing what type of object to construct is done with the socket
* connection factory, and it is possible for 3rd parties to register
* custom socket connection types for specific combination of socket
* family/type/protocol using g_socket_connection_factory_register_type().
* connection factory, and it is possible for 3rd parties to register
* custom socket connection types for specific combination of socket
* family/type/protocol using g_socket_connection_factory_register_type().
@@
-404,7
+404,7
@@
G_LOCK_DEFINE_STATIC(connection_factories);
* @protocol: a protocol id
*
* Looks up the #GType to be used when creating socket connections on
* @protocol: a protocol id
*
* Looks up the #GType to be used when creating socket connections on
- * sockets with the specified @family,@type and @protocol.
+ * sockets with the specified @family,
@type and @protocol.
*
* If no type is registered, the #GSocketConnection base type is returned.
*
*
* If no type is registered, the #GSocketConnection base type is returned.
*
@@
-458,7
+458,7
@@
init_builtin_types (void)
* @protocol_id: a protocol id
*
* Looks up the #GType to be used when creating socket connections on
* @protocol_id: a protocol id
*
* Looks up the #GType to be used when creating socket connections on
- * sockets with the specified @family,@type and @protocol_id.
+ * sockets with the specified @family,
@type and @protocol_id.
*
* If no type is registered, the #GSocketConnection base type is returned.
*
*
* If no type is registered, the #GSocketConnection base type is returned.
*
diff --git
a/gio/gsocketlistener.c
b/gio/gsocketlistener.c
index
c20bd5b
..
970540a
100644
(file)
--- a/
gio/gsocketlistener.c
+++ b/
gio/gsocketlistener.c
@@
-263,7
+263,7
@@
g_socket_listener_add_socket (GSocketListener *listener,
*
* Note that adding an IPv6 address, depending on the platform,
* may or may not result in a listener that also accepts IPv4
*
* Note that adding an IPv6 address, depending on the platform,
* may or may not result in a listener that also accepts IPv4
- * connections. For more determin
stic behaviou
r, see
+ * connections. For more determin
istic behavio
r, see
* g_socket_listener_add_inet_port().
*
* @source_object will be passed out in the various calls
* g_socket_listener_add_inet_port().
*
* @source_object will be passed out in the various calls
@@
-272,7
+272,7
@@
g_socket_listener_add_socket (GSocketListener *listener,
* different things depending on what address is connected to.
*
* If successful and @effective_address is non-%NULL then it will
* different things depending on what address is connected to.
*
* If successful and @effective_address is non-%NULL then it will
- * be set to the address that the binding actually occured at. This
+ * be set to the address that the binding actually occur
r
ed at. This
* is helpful for determining the port number that was used for when
* requesting a binding to port 0 (ie: "any port"). This address, if
* requested, belongs to the caller and must be freed.
* is helpful for determining the port number that was used for when
* requesting a binding to port 0 (ie: "any port"). This address, if
* requested, belongs to the caller and must be freed.
@@
-770,7
+770,7
@@
g_socket_listener_accept_socket_async (GSocketListener *listener,
* @listener: a #GSocketListener
* @result: a #GAsyncResult.
* @source_object: (out) (transfer none) (allow-none): Optional #GObject identifying this source
* @listener: a #GSocketListener
* @result: a #GAsyncResult.
* @source_object: (out) (transfer none) (allow-none): Optional #GObject identifying this source
- * @error: a #GError location to store the error occuring, or %NULL to
+ * @error: a #GError location to store the error occur
r
ing, or %NULL to
* ignore.
*
* Finishes an async accept operation. See g_socket_listener_accept_socket_async()
* ignore.
*
* Finishes an async accept operation. See g_socket_listener_accept_socket_async()
@@
-837,7
+837,7
@@
g_socket_listener_accept_async (GSocketListener *listener,
* @listener: a #GSocketListener
* @result: a #GAsyncResult.
* @source_object: (out) (transfer none) (allow-none): Optional #GObject identifying this source
* @listener: a #GSocketListener
* @result: a #GAsyncResult.
* @source_object: (out) (transfer none) (allow-none): Optional #GObject identifying this source
- * @error: a #GError location to store the error occuring, or %NULL to
+ * @error: a #GError location to store the error occur
r
ing, or %NULL to
* ignore.
*
* Finishes an async accept operation. See g_socket_listener_accept_async()
* ignore.
*
* Finishes an async accept operation. See g_socket_listener_accept_async()
@@
-928,11
+928,11
@@
g_socket_listener_close (GSocketListener *listener)
* g_socket_listener_add_any_inet_port:
* @listener: a #GSocketListener
* @source_object: (allow-none): Optional #GObject identifying this source
* g_socket_listener_add_any_inet_port:
* @listener: a #GSocketListener
* @source_object: (allow-none): Optional #GObject identifying this source
- * @error: a #GError location to store the error occuring, or %NULL to
+ * @error: a #GError location to store the error occur
r
ing, or %NULL to
* ignore.
*
* Listens for TCP connections on any available port number for both
* ignore.
*
* Listens for TCP connections on any available port number for both
- * IPv6 and IPv4 (if each
are
available).
+ * IPv6 and IPv4 (if each
is
available).
*
* This is useful if you need to have a socket for incoming connections
* but don't care about the specific port number.
*
* This is useful if you need to have a socket for incoming connections
* but don't care about the specific port number.
diff --git
a/gio/gsocketservice.c
b/gio/gsocketservice.c
index
18877d0
..
8302673
100644
(file)
--- a/
gio/gsocketservice.c
+++ b/
gio/gsocketservice.c
@@
-34,8
+34,8
@@
* signal is emitted.
*
* A #GSocketService is a subclass of #GSocketListener and you need
* signal is emitted.
*
* A #GSocketService is a subclass of #GSocketListener and you need
- * to add the addresses you want to accept connections on
to
the
- *
with the
#GSocketListener APIs.
+ * to add the addresses you want to accept connections on
with
the
+ * #GSocketListener APIs.
*
* There are two options for implementing a network service based on
* #GSocketService. The first is to create the service using
*
* There are two options for implementing a network service based on
* #GSocketService. The first is to create the service using
diff --git
a/gio/gtcpconnection.c
b/gio/gtcpconnection.c
index
cbb6064
..
69881f6
100644
(file)
--- a/
gio/gtcpconnection.c
+++ b/
gio/gtcpconnection.c
@@
-326,7
+326,7
@@
g_tcp_connection_close_async (GIOStream *stream,
* @graceful_disconnect: Whether to do graceful disconnects or not
*
* This enabled graceful disconnects on close. A graceful disconnect
* @graceful_disconnect: Whether to do graceful disconnects or not
*
* This enabled graceful disconnects on close. A graceful disconnect
- * means that we signal the rec
ie
ving end that the connection is terminated
+ * means that we signal the rec
ei
ving end that the connection is terminated
* and wait for it to close the connection before closing the connection.
*
* A graceful disconnect means that we can be sure that we successfully sent
* and wait for it to close the connection before closing the connection.
*
* A graceful disconnect means that we can be sure that we successfully sent
diff --git
a/gio/gthreadedsocketservice.c
b/gio/gthreadedsocketservice.c
index
e69804e
..
6d9bc41
100644
(file)
--- a/
gio/gthreadedsocketservice.c
+++ b/
gio/gthreadedsocketservice.c
@@
-37,7
+37,7
@@
* until the connection is closed.
*
* The service is implemented using a thread pool, so there is a
* until the connection is closed.
*
* The service is implemented using a thread pool, so there is a
- * limited amount of threads avail
ible to serve incom
ming requests.
+ * limited amount of threads avail
able to serve inco
ming requests.
* The service automatically stops the #GSocketService from accepting
* new connections when all threads are busy.
*
* The service automatically stops the #GSocketService from accepting
* new connections when all threads are busy.
*
@@
-234,7
+234,7
@@
g_threaded_socket_service_class_init (GThreadedSocketServiceClass *class)
* @connection and may perform blocking IO. The signal handler need
* not return until the connection is closed.
*
* @connection and may perform blocking IO. The signal handler need
* not return until the connection is closed.
*
- * Returns: %TRUE to stop
e
further signal handlers from being called
+ * Returns: %TRUE to stop further signal handlers from being called
*/
g_threaded_socket_service_run_signal =
g_signal_new ("run", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_LAST,
*/
g_threaded_socket_service_run_signal =
g_signal_new ("run", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_LAST,
diff --git
a/gio/gunixconnection.c
b/gio/gunixconnection.c
index
4d1cf40
..
0617bb9
100644
(file)
--- a/
gio/gunixconnection.c
+++ b/
gio/gunixconnection.c
@@
-66,8
+66,8
@@
G_DEFINE_TYPE_WITH_CODE (GUnixConnection, g_unix_connection,
* @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
* @error: (allow-none): #GError for error reporting, or %NULL to ignore.
*
* @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
* @error: (allow-none): #GError for error reporting, or %NULL to ignore.
*
- * Passes a file descriptor to the rec
ie
ving side of the
- * connection. The rec
ie
ving end has to call g_unix_connection_receive_fd()
+ * Passes a file descriptor to the rec
ei
ving side of the
+ * connection. The rec
ei
ving end has to call g_unix_connection_receive_fd()
* to accept the file descriptor.
*
* As well as sending the fd this also writes a single byte to the
* to accept the file descriptor.
*
* As well as sending the fd this also writes a single byte to the
@@
-308,7
+308,7
@@
gboolean g_unix_connection_create_pair (GUnixCo
* @error: Return location for error or %NULL.
*
* Passes the credentials of the current user the receiving side
* @error: Return location for error or %NULL.
*
* Passes the credentials of the current user the receiving side
- * of the connection. The rec
ie
ving end has to call
+ * of the connection. The rec
ei
ving end has to call
* g_unix_connection_receive_credentials() (or similar) to accept the
* credentials.
*
* g_unix_connection_receive_credentials() (or similar) to accept the
* credentials.
*