luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix signedness warning in gio/gsocket.c

Browse Source 
gio/gsocket.c: In function 'g_socket_get_available_bytes':
gio/gsocket.c:3141:17: warning: comparison of integer expressions of different signedness: 'u_long' {aka 'long unsigned int'} and 'int'
       if (avail == -1)
                 ^~
gio/gsocket.c: In function 'g_socket_send_messages_with_timeout':
gio/gsocket.c:5283:19: warning: comparison of integer expressions of different signedness: 'gint' {aka 'int'} and 'guint' {aka 'unsigned int'}
     for (i = 0; i < num_messages; ++i)
                   ^
gio/gsocket.c:5308:76: warning: operand of ?: changes signedness from 'int' to 'gsize' {aka 'long long unsigned int'} due to unsignedness of other operand
         result = pollable_result == G_POLLABLE_RETURN_OK ? bytes_written : -1;
                                                                            ^~
This commit is contained in:
Emmanuel Fleury 2021-05-14 14:04:16 +02:00
parent 23e9017aff
commit db5a9d8397
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gsocket.c
View File

@ -3138,7 +3138,7 @@ g_socket_get_available_bytes (GSocket *socket)
* systems add internal header size to the reported size, making it
* unusable for this function. */
avail = recv (socket->priv->fd, buf, bufsize, MSG_PEEK);
if (avail == -1)
if ((gint) avail == -1)
{
int errsv = get_socket_errno ();
#ifdef G_OS_WIN32
@ -5275,7 +5275,7 @@ g_socket_send_messages_with_timeout (GSocket *socket,
#else
{
gssize result;
gint i;
guint i;
gint64 wait_timeout;
wait_timeout = timeout_us;
@ -5305,7 +5305,11 @@ g_socket_send_messages_with_timeout (GSocket *socket,
#endif
}
result = pollable_result == G_POLLABLE_RETURN_OK ? bytes_written : -1;
if (G_MAXSSIZE > bytes_written &&
pollable_result == G_POLLABLE_RETURN_OK)
result = (gssize) bytes_written;
else
result = -1;
/* check if we've timed out or how much time to wait at most */
if (timeout_us > 0)