luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-25 08:36:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

socketaddress: Use more clear GSocketFamily type

Browse Source 
The value of them should be identical, but it feels odd to
not pass the expected enum type.
This commit is contained in:
Patrick Griffis 2025-03-23 13:45:38 -05:00
parent bbba92630b
commit 752b6447d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gsocketaddress.c
View File

@ -226,7 +226,7 @@ g_socket_address_new_from_native (gpointer native,
if (len < sizeof (*addr)) if (len < sizeof (*addr))
return NULL; return NULL;
iaddr = g_inet_address_new_from_bytes ((guint8 *) &(addr->sin_addr), AF_INET); iaddr = g_inet_address_new_from_bytes ((guint8 *) &(addr->sin_addr), G_SOCKET_FAMILY_IPV4);
sockaddr = g_inet_socket_address_new (iaddr, g_ntohs (addr->sin_port)); sockaddr = g_inet_socket_address_new (iaddr, g_ntohs (addr->sin_port));
g_object_unref (iaddr); g_object_unref (iaddr);
return sockaddr; return sockaddr;
@ -248,11 +248,11 @@ g_socket_address_new_from_native (gpointer native,
sin_addr.sin_family = AF_INET; sin_addr.sin_family = AF_INET;
sin_addr.sin_port = addr->sin6_port; sin_addr.sin_port = addr->sin6_port;
memcpy (&(sin_addr.sin_addr.s_addr), addr->sin6_addr.s6_addr + 12, 4); memcpy (&(sin_addr.sin_addr.s_addr), addr->sin6_addr.s6_addr + 12, 4);
iaddr = g_inet_address_new_from_bytes ((guint8 *) &(sin_addr.sin_addr), AF_INET); iaddr = g_inet_address_new_from_bytes ((guint8 *) &(sin_addr.sin_addr), G_SOCKET_FAMILY_IPV4);
} }
else else
{ {
iaddr = g_inet_address_new_from_bytes ((guint8 *) &(addr->sin6_addr), AF_INET6); iaddr = g_inet_address_new_from_bytes ((guint8 *) &(addr->sin6_addr), G_SOCKET_FAMILY_IPV6);
} }
sockaddr = g_object_new (G_TYPE_INET_SOCKET_ADDRESS, sockaddr = g_object_new (G_TYPE_INET_SOCKET_ADDRESS,