luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-30 17:36:16 +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!1911
This commit is contained in:
Sebastian Dröge 2021-02-02 16:11:53 +00:00
commit 7e958fd1fe
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gapplication.c
View File

@ -542,7 +542,7 @@ g_application_parse_command_line (GApplication *application,
{ {
GOptionEntry entries[] = { GOptionEntry entries[] = {
{ "gapplication-service", '\0', 0, G_OPTION_ARG_NONE, &become_service, { "gapplication-service", '\0', 0, G_OPTION_ARG_NONE, &become_service,
N_("Enter GApplication service mode (use from D-Bus service files)") }, N_("Enter GApplication service mode (use from D-Bus service files)"), NULL },
{ NULL } { NULL }
}; };
@ -554,7 +554,7 @@ g_application_parse_command_line (GApplication *application,
{ {
GOptionEntry entries[] = { GOptionEntry entries[] = {
{ "gapplication-app-id", '\0', 0, G_OPTION_ARG_STRING, &app_id, { "gapplication-app-id", '\0', 0, G_OPTION_ARG_STRING, &app_id,
N_("Override the application’s ID") }, N_("Override the application’s ID"), NULL },
{ NULL } { NULL }
}; };
@ -566,7 +566,7 @@ g_application_parse_command_line (GApplication *application,
{ {
GOptionEntry entries[] = { GOptionEntry entries[] = {
{ "gapplication-replace", '\0', 0, G_OPTION_ARG_NONE, &replace, { "gapplication-replace", '\0', 0, G_OPTION_ARG_NONE, &replace,
N_("Replace the running instance") }, N_("Replace the running instance"), NULL },
{ NULL } { NULL }
}; };

3
gio/gdbusconnection.c
View File

@ -5530,7 +5530,8 @@ g_dbus_connection_register_object_with_closures (GDBusConnection *connection
{ {
method_call_closure != NULL ? register_with_closures_on_method_call : NULL, method_call_closure != NULL ? register_with_closures_on_method_call : NULL,
get_property_closure != NULL ? register_with_closures_on_get_property : NULL, get_property_closure != NULL ? register_with_closures_on_get_property : NULL,
set_property_closure != NULL ? register_with_closures_on_set_property : NULL set_property_closure != NULL ? register_with_closures_on_set_property : NULL,
{ 0 }
}; };
data = register_object_data_new (method_call_closure, get_property_closure, set_property_closure); data = register_object_data_new (method_call_closure, get_property_closure, set_property_closure);

3
gio/gdbusobjectmanagerserver.c
View File

@ -888,7 +888,8 @@ static const GDBusInterfaceVTable manager_interface_vtable =
{ {
manager_method_call, /* handle_method_call */ manager_method_call, /* handle_method_call */
NULL, /* get_property */ NULL, /* get_property */
NULL /* set_property */ NULL, /* set_property */
{ 0 }
}; };
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */

2
gio/gdelayedsettingsbackend.c
View File

@ -403,7 +403,7 @@ delayed_backend_path_writable_changed (GObject *target,
if (n_keys > 0) if (n_keys > 0)
{ {
CheckPrefixState state = { path, g_new (const gchar *, n_keys) }; CheckPrefixState state = { path, g_new (const gchar *, n_keys), 0 };
gsize i; gsize i;
/* collect a list of possibly-affected keys (ie: matching the path) */ /* collect a list of possibly-affected keys (ie: matching the path) */

9
gio/ghttpproxy.c
View File

@ -190,7 +190,7 @@ g_http_proxy_connect (GProxy *proxy,
GOutputStream *out; GOutputStream *out;
gchar *buffer = NULL; gchar *buffer = NULL;
gsize buffer_length; gsize buffer_length;
gssize bytes_read; gsize bytes_read;
gboolean has_cred; gboolean has_cred;
GIOStream *tlsconn = NULL; GIOStream *tlsconn = NULL;
@ -239,12 +239,15 @@ g_http_proxy_connect (GProxy *proxy,
*/ */
do do
{ {
gssize signed_nread;
gsize nread; gsize nread;
nread = g_input_stream_read (in, buffer + bytes_read, 1, cancellable, error); signed_nread =
if (nread == -1) g_input_stream_read (in, buffer + bytes_read, 1, cancellable, error);
if (signed_nread == -1)
goto error; goto error;
nread = signed_nread;
if (nread == 0) if (nread == 0)
break; break;