Merge branch 'fix_more_warnings' into 'master'

Fix more warnings

See merge request GNOME/glib!1823
This commit is contained in:
Philip Withnall
2021-01-12 18:03:06 +00:00
5 changed files with 18 additions and 11 deletions

View File

@@ -3767,7 +3767,9 @@ static GSourceFuncs broken_funcs =
NULL,
NULL,
broken_dispatch,
NULL
NULL,
NULL,
NULL,
};
#ifdef G_OS_WIN32
@@ -4082,6 +4084,7 @@ static GSourceFuncs socket_source_funcs =
socket_source_dispatch,
socket_source_finalize,
(GSourceFunc)socket_source_closure_callback,
NULL,
};
static GSource *
@@ -4533,7 +4536,7 @@ G_STMT_START { \
else \
/* ABI is incompatible */ \
{ \
gint i; \
guint i; \
\
_msg->msg_iov = g_newa (struct iovec, _message->num_vectors); \
for (i = 0; i < _message->num_vectors; i++) \
@@ -4548,7 +4551,7 @@ G_STMT_START { \
/* control */ \
{ \
struct cmsghdr *cmsg; \
gint i; \
guint i; \
\
_msg->msg_controllen = 0; \
for (i = 0; i < _message->num_control_messages; i++) \
@@ -5161,7 +5164,7 @@ g_socket_send_messages_with_timeout (GSocket *socket,
#if !defined (G_OS_WIN32) && defined (HAVE_SENDMMSG)
{
struct mmsghdr *msgvec;
gint i, num_sent;
guint i, num_sent;
/* Clamp the number of vectors if more given than we can write in one go.
* The caller has to handle short writes anyway.