luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-10 12:55:48 +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!1891
This commit is contained in:
Philip Withnall 2021-01-30 22:34:40 +00:00
commit ede8900f4e
8 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gactiongroupexporter.c
View File

@ -538,7 +538,7 @@ g_dbus_connection_export_action_group (GDBusConnection *connection,
GError **error) GError **error)
{ {
const GDBusInterfaceVTable vtable = { const GDBusInterfaceVTable vtable = {
org_gtk_Actions_method_call org_gtk_Actions_method_call, NULL, NULL, { 0 }
}; };
GActionGroupExporter *exporter; GActionGroupExporter *exporter;
guint id; guint id;

9
gio/gapplicationimpl-dbus.c
View File

@ -361,10 +361,11 @@ g_application_impl_attempt_primary (GApplicationImpl *impl,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
const static GDBusInterfaceVTable vtable = { static const GDBusInterfaceVTable vtable = {
g_application_impl_method_call, g_application_impl_method_call,
g_application_impl_get_property, g_application_impl_get_property,
NULL /* set_property */ NULL, /* set_property */
{ 0 }
}; };
GApplicationClass *app_class = G_APPLICATION_GET_CLASS (impl->app); GApplicationClass *app_class = G_APPLICATION_GET_CLASS (impl->app);
GBusNameOwnerFlags name_owner_flags; GBusNameOwnerFlags name_owner_flags;
@ -775,8 +776,8 @@ g_application_impl_command_line (GApplicationImpl *impl,
const gchar * const *arguments, const gchar * const *arguments,
GVariant *platform_data) GVariant *platform_data)
{ {
const static GDBusInterfaceVTable vtable = { static const GDBusInterfaceVTable vtable = {
g_application_impl_cmdline_method_call g_application_impl_cmdline_method_call, NULL, NULL, { 0 }
}; };
const gchar *object_path = "/org/gtk/Application/CommandLine"; const gchar *object_path = "/org/gtk/Application/CommandLine";
GMainContext *context; GMainContext *context;

2
gio/gdatainputstream.c
View File

@ -310,7 +310,7 @@ read_data (GDataInputStream *stream,
res = g_input_stream_read (G_INPUT_STREAM (stream), res = g_input_stream_read (G_INPUT_STREAM (stream),
buffer, size, buffer, size,
NULL, NULL); NULL, NULL);
g_warn_if_fail (res == size); g_warn_if_fail (res >= 0 && (gsize) res == size);
return TRUE; return TRUE;
} }

2
gio/gkeyfilesettingsbackend.c
View File

@ -362,7 +362,7 @@ g_keyfile_settings_backend_write_tree (GSettingsBackend *backend,
GTree *tree, GTree *tree,
gpointer origin_tag) gpointer origin_tag)
{ {
WriteManyData data = { G_KEYFILE_SETTINGS_BACKEND (backend) }; WriteManyData data = { G_KEYFILE_SETTINGS_BACKEND (backend), 0 };
gboolean success; gboolean success;
GError *error = NULL; GError *error = NULL;

2
gio/gmenuexporter.c
View File

@ -783,7 +783,7 @@ g_dbus_connection_export_menu_model (GDBusConnection *connection,
GError **error) GError **error)
{ {
const GDBusInterfaceVTable vtable = { const GDBusInterfaceVTable vtable = {
g_menu_exporter_method_call, g_menu_exporter_method_call, NULL, NULL, { 0 }
}; };
GMenuExporter *exporter; GMenuExporter *exporter;
guint id; guint id;

2
gio/gnetworkmonitornetlink.c
View File

@ -267,7 +267,7 @@ remove_network (GNetworkMonitorNetlink *nl,
if (nl->priv->dump_networks) if (nl->priv->dump_networks)
{ {
GInetAddressMask **dump_networks = (GInetAddressMask **)nl->priv->dump_networks->pdata; GInetAddressMask **dump_networks = (GInetAddressMask **)nl->priv->dump_networks->pdata;
int i; guint i;
for (i = 0; i < nl->priv->dump_networks->len; i++) for (i = 0; i < nl->priv->dump_networks->len; i++)
{ {

6
gio/gsocketlistener.c
View File

@ -606,7 +606,7 @@ add_sources (GSocketListener *listener,
GSocket *socket; GSocket *socket;
GSource *source; GSource *source;
GList *sources; GList *sources;
int i; guint i;
sources = NULL; sources = NULL;
for (i = 0; i < listener->priv->sockets->len; i++) for (i = 0; i < listener->priv->sockets->len; i++)
@ -983,7 +983,7 @@ g_socket_listener_set_backlog (GSocketListener *listener,
int listen_backlog) int listen_backlog)
{ {
GSocket *socket; GSocket *socket;
int i; guint i;
if (listener->priv->closed) if (listener->priv->closed)
return; return;
@ -1009,7 +1009,7 @@ void
g_socket_listener_close (GSocketListener *listener) g_socket_listener_close (GSocketListener *listener)
{ {
GSocket *socket; GSocket *socket;
int i; guint i;
g_return_if_fail (G_IS_SOCKET_LISTENER (listener)); g_return_if_fail (G_IS_SOCKET_LISTENER (listener));

4
gio/gtask.c
View File

@ -2162,7 +2162,9 @@ GSourceFuncs trivial_source_funcs = {
NULL, /* prepare */ NULL, /* prepare */
NULL, /* check */ NULL, /* check */
trivial_source_dispatch, trivial_source_dispatch,
NULL NULL, /* finalize */
NULL, /* closure */
NULL /* marshal */
}; };
static void static void