mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-14 08:16:24 +01:00
Merge branch 'socket-flags' into 'master'
gsocket: Remove (type) annotation from flags arguments Closes gjs#227 See merge request GNOME/glib!728
This commit is contained in:
commit
f5a468a83a
@ -4540,7 +4540,7 @@ input_message_from_msghdr (const struct msghdr *msg,
|
|||||||
* @messages: (array length=num_messages) (nullable): a pointer to an
|
* @messages: (array length=num_messages) (nullable): a pointer to an
|
||||||
* array of #GSocketControlMessages, or %NULL.
|
* array of #GSocketControlMessages, or %NULL.
|
||||||
* @num_messages: number of elements in @messages, or -1.
|
* @num_messages: number of elements in @messages, or -1.
|
||||||
* @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags
|
* @flags: an int containing #GSocketMsgFlags flags
|
||||||
* @cancellable: (nullable): a %GCancellable or %NULL
|
* @cancellable: (nullable): a %GCancellable or %NULL
|
||||||
* @error: #GError for error reporting, or %NULL to ignore.
|
* @error: #GError for error reporting, or %NULL to ignore.
|
||||||
*
|
*
|
||||||
@ -4629,7 +4629,7 @@ g_socket_send_message (GSocket *socket,
|
|||||||
* @messages: (array length=num_messages) (nullable): a pointer to an
|
* @messages: (array length=num_messages) (nullable): a pointer to an
|
||||||
* array of #GSocketControlMessages, or %NULL.
|
* array of #GSocketControlMessages, or %NULL.
|
||||||
* @num_messages: number of elements in @messages, or -1.
|
* @num_messages: number of elements in @messages, or -1.
|
||||||
* @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags
|
* @flags: an int containing #GSocketMsgFlags flags
|
||||||
* @timeout_us: the maximum time (in microseconds) to wait, or -1
|
* @timeout_us: the maximum time (in microseconds) to wait, or -1
|
||||||
* @bytes_written: (out) (optional): location to store the number of bytes that were written to the socket
|
* @bytes_written: (out) (optional): location to store the number of bytes that were written to the socket
|
||||||
* @cancellable: (nullable): a %GCancellable or %NULL
|
* @cancellable: (nullable): a %GCancellable or %NULL
|
||||||
@ -4862,7 +4862,7 @@ g_socket_send_message_with_timeout (GSocket *socket,
|
|||||||
* @socket: a #GSocket
|
* @socket: a #GSocket
|
||||||
* @messages: (array length=num_messages): an array of #GOutputMessage structs
|
* @messages: (array length=num_messages): an array of #GOutputMessage structs
|
||||||
* @num_messages: the number of elements in @messages
|
* @num_messages: the number of elements in @messages
|
||||||
* @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags
|
* @flags: an int containing #GSocketMsgFlags flags
|
||||||
* @cancellable: (nullable): a %GCancellable or %NULL
|
* @cancellable: (nullable): a %GCancellable or %NULL
|
||||||
* @error: #GError for error reporting, or %NULL to ignore.
|
* @error: #GError for error reporting, or %NULL to ignore.
|
||||||
*
|
*
|
||||||
@ -5362,7 +5362,7 @@ g_socket_receive_message_with_timeout (GSocket *socket,
|
|||||||
* @socket: a #GSocket
|
* @socket: a #GSocket
|
||||||
* @messages: (array length=num_messages): an array of #GInputMessage structs
|
* @messages: (array length=num_messages): an array of #GInputMessage structs
|
||||||
* @num_messages: the number of elements in @messages
|
* @num_messages: the number of elements in @messages
|
||||||
* @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags for the overall operation
|
* @flags: an int containing #GSocketMsgFlags flags for the overall operation
|
||||||
* @cancellable: (nullable): a %GCancellable or %NULL
|
* @cancellable: (nullable): a %GCancellable or %NULL
|
||||||
* @error: #GError for error reporting, or %NULL to ignore
|
* @error: #GError for error reporting, or %NULL to ignore
|
||||||
*
|
*
|
||||||
@ -5648,7 +5648,7 @@ g_socket_receive_messages_with_timeout (GSocket *socket,
|
|||||||
* which may be filled with an array of #GSocketControlMessages, or %NULL
|
* which may be filled with an array of #GSocketControlMessages, or %NULL
|
||||||
* @num_messages: (out): a pointer which will be filled with the number of
|
* @num_messages: (out): a pointer which will be filled with the number of
|
||||||
* elements in @messages, or %NULL
|
* elements in @messages, or %NULL
|
||||||
* @flags: (type GSocketMsgFlags) (inout): a pointer to an int containing #GSocketMsgFlags flags
|
* @flags: (inout): a pointer to an int containing #GSocketMsgFlags flags
|
||||||
* @cancellable: a %GCancellable or %NULL
|
* @cancellable: a %GCancellable or %NULL
|
||||||
* @error: a #GError pointer, or %NULL
|
* @error: a #GError pointer, or %NULL
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user