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

Merge branch 'fix_more_warnings' into 'master'

Browse Source 
Fix more warnings

See merge request GNOME/glib!1823
This commit is contained in:
Philip Withnall 2021-01-12 18:03:06 +00:00
commit 8d78b92794
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gcredentials.c
View File

@ -314,8 +314,8 @@ linux_ucred_check_valid (struct ucred *native,
GError **error) GError **error)
{ {
if (native->pid == 0 if (native->pid == 0
|| native->uid == -1 || native->uid == (uid_t) -1
|| native->gid == -1) || native->gid == (gid_t) -1)
{ {
g_set_error_literal (error, g_set_error_literal (error,
G_IO_ERROR, G_IO_ERROR,
@ -636,7 +636,7 @@ g_credentials_set_unix_user (GCredentials *credentials,
gboolean ret = FALSE; gboolean ret = FALSE;
g_return_val_if_fail (G_IS_CREDENTIALS (credentials), FALSE); g_return_val_if_fail (G_IS_CREDENTIALS (credentials), FALSE);
g_return_val_if_fail (uid != -1, FALSE); g_return_val_if_fail (uid != (uid_t) -1, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
#if G_CREDENTIALS_USE_LINUX_UCRED #if G_CREDENTIALS_USE_LINUX_UCRED

2
gio/goutputstream.c
View File

@ -2344,7 +2344,7 @@ g_output_stream_real_writev (GOutputStream *stream,
_bytes_written += res; _bytes_written += res;
/* if we had a short write break the loop here */ /* if we had a short write break the loop here */
if (res < vectors[i].size) if ((gsize) res < vectors[i].size)
break; break;
} }

2
gio/gpollableoutputstream.c
View File

@ -214,7 +214,7 @@ g_pollable_output_stream_default_writev_nonblocking (GPollableOutputStream *str
_bytes_written += res; _bytes_written += res;
/* if we had a short write break the loop here */ /* if we had a short write break the loop here */
if (res < vectors[i].size) if ((gsize) res < vectors[i].size)
break; break;
} }

8
gio/gsimpleproxyresolver.c
View File

@ -50,7 +50,7 @@
typedef struct { typedef struct {
gchar *name; gchar *name;
gint length; gsize length;
gushort port; gushort port;
} GSimpleProxyResolverDomain; } GSimpleProxyResolverDomain;
@ -259,7 +259,8 @@ ignore_host (GSimpleProxyResolver *resolver,
GSimpleProxyResolverPrivate *priv = resolver->priv; GSimpleProxyResolverPrivate *priv = resolver->priv;
gchar *ascii_host = NULL; gchar *ascii_host = NULL;
gboolean ignore = FALSE; gboolean ignore = FALSE;
gint i, length, offset; gsize offset, length;
guint i;
if (priv->ignore_ips) if (priv->ignore_ips)
{ {
@ -297,6 +298,9 @@ ignore_host (GSimpleProxyResolver *resolver,
{ {
GSimpleProxyResolverDomain *domain = &priv->ignore_domains[i]; GSimpleProxyResolverDomain *domain = &priv->ignore_domains[i];
if (domain->length > length)
continue;
offset = length - domain->length; offset = length - domain->length;
if ((domain->port == 0 || domain->port == port) && if ((domain->port == 0 || domain->port == port) &&
(offset == 0 || (offset > 0 && host[offset - 1] == '.')) && (offset == 0 || (offset > 0 && host[offset - 1] == '.')) &&

11
gio/gsocket.c
View File

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