Merge branch 'fix_more_warnings' into 'master'

Fix more warnings

See merge request GNOME/glib!2047
This commit is contained in:
Sebastian Dröge 2021-04-15 09:22:17 +00:00
commit 1afb4c0b96
7 changed files with 11 additions and 8 deletions

View File

@ -174,7 +174,7 @@ typedef struct
gint monitor_deleted; gint monitor_deleted;
gint monitor_changed; gint monitor_changed;
gchar *monitor_path; gchar *monitor_path;
gint pos; gsize pos;
const gchar *data; const gchar *data;
gchar *buffer; gchar *buffer;
guint timeout; guint timeout;

View File

@ -225,7 +225,8 @@ static const GDBusInterfaceVTable interface_vtable =
{ {
handle_method_call, handle_method_call,
handle_get_property, handle_get_property,
handle_set_property handle_set_property,
{ 0 }
}; };
static void static void

View File

@ -117,6 +117,7 @@ static const GDBusInterfaceVTable interface_vtable =
handle_method_call, handle_method_call,
NULL, NULL,
NULL, NULL,
{ 0 }
}; };
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */

View File

@ -322,7 +322,7 @@ handle_method_call (GDBusConnection *connection,
const guint64 *uint64s; const guint64 *uint64s;
const gdouble *doubles; const gdouble *doubles;
gsize n_elts; gsize n_elts;
gint i, j; gsize i, j;
GVariantBuilder ret; GVariantBuilder ret;
g_variant_builder_init (&ret, G_VARIANT_TYPE ("(ayabanaqaiauaxatad)")); g_variant_builder_init (&ret, G_VARIANT_TYPE ("(ayabanaqaiauaxatad)"));
@ -802,7 +802,8 @@ static const GDBusInterfaceVTable interface_vtable =
{ {
handle_method_call, handle_method_call,
handle_get_property, handle_get_property,
handle_set_property handle_set_property,
{ 0 }
}; };
static void static void

View File

@ -2397,7 +2397,7 @@ strv_has_string (gchar **haystack,
static gboolean static gboolean
strv_set_equal (gchar **strv, ...) strv_set_equal (gchar **strv, ...)
{ {
gint count; gsize count;
va_list list; va_list list;
const gchar *str; const gchar *str;
gboolean res; gboolean res;

View File

@ -5,7 +5,7 @@
static gboolean static gboolean
strv_equal (gchar **strv, ...) strv_equal (gchar **strv, ...)
{ {
gint count; gsize count;
va_list list; va_list list;
const gchar *str; const gchar *str;
gboolean res; gboolean res;

View File

@ -842,8 +842,8 @@ do_echo_test (GSocketConnection *conn)
GIOStream *iostream = G_IO_STREAM (conn); GIOStream *iostream = G_IO_STREAM (conn);
GInputStream *istream = g_io_stream_get_input_stream (iostream); GInputStream *istream = g_io_stream_get_input_stream (iostream);
GOutputStream *ostream = g_io_stream_get_output_stream (iostream); GOutputStream *ostream = g_io_stream_get_output_stream (iostream);
gssize nread, total; gssize nread;
gsize nwrote; gsize nwrote, total;
gchar buf[128]; gchar buf[128];
GError *error = NULL; GError *error = NULL;