luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'use-socklen-t' into 'main'

Browse Source 
gsocket: use socklen_t in more places to fix build under cygwin

See merge request GNOME/glib!3105
This commit is contained in:
Philip Withnall 2022-12-02 21:24:52 +00:00
commit f4c9b42084
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gsocket.c
View File

@ -461,7 +461,7 @@ g_socket_details_from_fd (GSocket *socket)
struct sockaddr sa; struct sockaddr sa;
} address; } address;
gint fd; gint fd;
guint addrlen; socklen_t addrlen;
int value, family; int value, family;
int errsv; int errsv;
@ -503,7 +503,7 @@ g_socket_details_from_fd (GSocket *socket)
if (addrlen > 0) if (addrlen > 0)
{ {
g_assert (G_STRUCT_OFFSET (struct sockaddr, sa_family) + g_assert (G_STRUCT_OFFSET (struct sockaddr, sa_family) +
sizeof address.storage.ss_family <= addrlen); (socklen_t) sizeof address.storage.ss_family <= addrlen);
family = address.storage.ss_family; family = address.storage.ss_family;
} }
else else
@ -1990,7 +1990,7 @@ g_socket_get_local_address (GSocket *socket,
struct sockaddr_storage storage; struct sockaddr_storage storage;
struct sockaddr sa; struct sockaddr sa;
} buffer; } buffer;
guint len = sizeof (buffer); socklen_t len = sizeof (buffer);
g_return_val_if_fail (G_IS_SOCKET (socket), NULL); g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
@ -2026,7 +2026,7 @@ g_socket_get_remote_address (GSocket *socket,
struct sockaddr_storage storage; struct sockaddr_storage storage;
struct sockaddr sa; struct sockaddr sa;
} buffer; } buffer;
guint len = sizeof (buffer); socklen_t len = sizeof (buffer);
g_return_val_if_fail (G_IS_SOCKET (socket), NULL); g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
@ -4679,7 +4679,7 @@ input_message_from_msghdr (const struct msghdr *msg,
GPtrArray *my_messages = NULL; GPtrArray *my_messages = NULL;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
if (msg->msg_controllen >= sizeof (struct cmsghdr)) if (msg->msg_controllen >= (socklen_t) sizeof (struct cmsghdr))
{ {
g_assert (message->control_messages != NULL); g_assert (message->control_messages != NULL);
for (cmsg = CMSG_FIRSTHDR (msg); for (cmsg = CMSG_FIRSTHDR (msg);
@ -6220,7 +6220,7 @@ g_socket_get_option (GSocket *socket,
gint *value, gint *value,
GError **error) GError **error)
{ {
guint size; socklen_t size;
g_return_val_if_fail (G_IS_SOCKET (socket), FALSE); g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);