Merge branch 'fix_more_warnings' into 'master'

Fix more warnings

See merge request GNOME/glib!1815
This commit is contained in:
Sebastian Dröge 2020-12-17 08:53:08 +00:00
commit 6723633fd7
6 changed files with 15 additions and 6 deletions

View File

@ -770,6 +770,7 @@ static GSourceFuncs cancellable_source_funcs =
cancellable_source_dispatch, cancellable_source_dispatch,
NULL, NULL,
(GSourceFunc)cancellable_source_closure_callback, (GSourceFunc)cancellable_source_closure_callback,
NULL,
}; };
/** /**

View File

@ -73,7 +73,8 @@ g_context_specific_source_new (const gchar *name,
NULL, NULL,
NULL, NULL,
g_context_specific_source_dispatch, g_context_specific_source_dispatch,
g_context_specific_source_finalize g_context_specific_source_finalize,
NULL, NULL
}; };
GContextSpecificSource *css; GContextSpecificSource *css;
GSource *source; GSource *source;

View File

@ -372,8 +372,8 @@ ik_source_new (gboolean (* callback) (ik_event_t *event))
{ {
static GSourceFuncs source_funcs = { static GSourceFuncs source_funcs = {
NULL, NULL, NULL, NULL,
ik_source_dispatch ik_source_dispatch,
/* should have a finalize, but it will never happen */ NULL, NULL, NULL
}; };
InotifyKernelSource *iks; InotifyKernelSource *iks;
GSource *source; GSource *source;

View File

@ -554,7 +554,7 @@ properties_get_property (void)
{ "bar", G_TYPE_INVALID, G_VALUE_INIT }, { "bar", G_TYPE_INVALID, G_VALUE_INIT },
{ "bar", G_TYPE_STRING, G_VALUE_INIT }, { "bar", G_TYPE_STRING, G_VALUE_INIT },
}; };
int i; gsize i;
g_test_summary ("g_object_get_property() accepts uninitialized, " g_test_summary ("g_object_get_property() accepts uninitialized, "
"initialized, and transformable values"); "initialized, and transformable values");

View File

@ -1148,7 +1148,7 @@ test_introspection (void)
guint *ids; guint *ids;
guint n_ids; guint n_ids;
const gchar *name; const gchar *name;
gint i; guint i;
const gchar *names[] = { const gchar *names[] = {
"simple", "simple",
"simple-detailed", "simple-detailed",

View File

@ -40,7 +40,8 @@ prefix ## _get_type (void) \
NULL, /* class_data */ \ NULL, /* class_data */ \
sizeof (name), \ sizeof (name), \
0, /* n_prelocs */ \ 0, /* n_prelocs */ \
(GInstanceInitFunc) instance_init \ (GInstanceInitFunc) instance_init, \
(const GTypeValueTable *) NULL, \
}; \ }; \
\ \
object_type = g_type_register_static (parent_type, \ object_type = g_type_register_static (parent_type, \
@ -72,6 +73,12 @@ prefix ## _get_type (void) \
(GBaseInitFunc) base_init, \ (GBaseInitFunc) base_init, \
(GBaseFinalizeFunc) NULL, \ (GBaseFinalizeFunc) NULL, \
(GClassInitFunc) dflt_init, \ (GClassInitFunc) dflt_init, \
(GClassFinalizeFunc) NULL, \
(gconstpointer) NULL, \
(guint16) 0, \
(guint16) 0, \
(GInstanceInitFunc) NULL, \
(const GTypeValueTable*) NULL, \
}; \ }; \
\ \
iface_type = g_type_register_static (G_TYPE_INTERFACE, \ iface_type = g_type_register_static (G_TYPE_INTERFACE, \