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

actiongroup: Add a compiler warning

Browse Source 
Warn when the boolean return isn't used, since we may not initialize
the out arguments in the FALSE case. Update all internal callers to
use the return value. They were already safe, but users outside GLib
may not be.
This commit is contained in:
Matthias Clasen 2023-04-07 08:12:06 -04:00
parent adcf017eb4
commit e03a96e934
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gio/gactiongroup.c
View File

@ -133,9 +133,10 @@ static gboolean
g_action_group_real_get_action_enabled (GActionGroup *action_group, g_action_group_real_get_action_enabled (GActionGroup *action_group,
const gchar *action_name) const gchar *action_name)
{ {
gboolean enabled = FALSE; gboolean enabled;
g_action_group_query_action (action_group, action_name, &enabled, NULL, NULL, NULL, NULL); if (!g_action_group_query_action (action_group, action_name, &enabled, NULL, NULL, NULL, NULL))
return FALSE;
return enabled; return enabled;
} }
@ -144,9 +145,10 @@ static const GVariantType *
g_action_group_real_get_action_parameter_type (GActionGroup *action_group, g_action_group_real_get_action_parameter_type (GActionGroup *action_group,
const gchar *action_name) const gchar *action_name)
{ {
const GVariantType *type = NULL; const GVariantType *type;
g_action_group_query_action (action_group, action_name, NULL, &type, NULL, NULL, NULL); if (!g_action_group_query_action (action_group, action_name, NULL, &type, NULL, NULL, NULL))
return NULL;
return type; return type;
} }
@ -155,9 +157,10 @@ static const GVariantType *
g_action_group_real_get_action_state_type (GActionGroup *action_group, g_action_group_real_get_action_state_type (GActionGroup *action_group,
const gchar *action_name) const gchar *action_name)
{ {
const GVariantType *type = NULL; const GVariantType *type;
g_action_group_query_action (action_group, action_name, NULL, NULL, &type, NULL, NULL); if (!g_action_group_query_action (action_group, action_name, NULL, NULL, &type, NULL, NULL))
return NULL;
return type; return type;
} }
@ -166,9 +169,10 @@ static GVariant *
g_action_group_real_get_action_state_hint (GActionGroup *action_group, g_action_group_real_get_action_state_hint (GActionGroup *action_group,
const gchar *action_name) const gchar *action_name)
{ {
GVariant *hint = NULL; GVariant *hint;
g_action_group_query_action (action_group, action_name, NULL, NULL, NULL, &hint, NULL); if (!g_action_group_query_action (action_group, action_name, NULL, NULL, NULL, &hint, NULL))
return NULL;
return hint; return hint;
} }
@ -177,9 +181,10 @@ static GVariant *
g_action_group_real_get_action_state (GActionGroup *action_group, g_action_group_real_get_action_state (GActionGroup *action_group,
const gchar *action_name) const gchar *action_name)
{ {
GVariant *state = NULL; GVariant *state;
g_action_group_query_action (action_group, action_name, NULL, NULL, NULL, NULL, &state); if (!g_action_group_query_action (action_group, action_name, NULL, NULL, NULL, NULL, &state))
return NULL;
return state; return state;
} }

2
gio/gactiongroup.h
View File

@ -156,7 +156,7 @@ gboolean g_action_group_query_action (GAction
const GVariantType **parameter_type, const GVariantType **parameter_type,
const GVariantType **state_type, const GVariantType **state_type,
GVariant **state_hint, GVariant **state_hint,
GVariant **state); GVariant **state) G_GNUC_WARN_UNUSED_RESULT;
G_END_DECLS G_END_DECLS