summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAlessandro Bono <alessandro.bono369@gmail.com>2022-08-31 15:45:36 +0200
committerAlessandro Bono <alessandro.bono369@gmail.com>2022-10-29 12:39:08 +0200
commitb232e0866d501e62a391318ed4c8452fb1ee8aef (patch)
tree3564effa2728c2e1de1ac2c55f42a2c8428eb01d /common
parent51df78d96d71ae063fe6454cc9ee6cc9842425ab (diff)
downloadgdm-b232e0866d501e62a391318ed4c8452fb1ee8aef.tar.gz
gdm-settings-direct: Add missing guards in public functions
gdm_settings_direct_get_string() is never called with value == NULL. Remove the check to make it behave like the other "get" functions.
Diffstat (limited to 'common')
-rw-r--r--common/gdm-settings-direct.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/common/gdm-settings-direct.c b/common/gdm-settings-direct.c
index c3653172..b6954fb0 100644
--- a/common/gdm-settings-direct.c
+++ b/common/gdm-settings-direct.c
@@ -102,6 +102,7 @@ gdm_settings_direct_get_int (const char *key,
char *str;
g_return_val_if_fail (key != NULL, FALSE);
+ g_return_val_if_fail (value != NULL, FALSE);
entry = get_entry_for_key (key);
g_assert (entry != NULL);
@@ -129,6 +130,9 @@ gdm_settings_direct_get_uint (const char *key,
gboolean ret;
int intvalue;
+ g_return_val_if_fail (key != NULL, FALSE);
+ g_return_val_if_fail (value != NULL, FALSE);
+
ret = gdm_settings_direct_get_int (key, &intvalue);
if (intvalue >= 0)
@@ -149,6 +153,7 @@ gdm_settings_direct_get_boolean (const char *key,
char *str;
g_return_val_if_fail (key != NULL, FALSE);
+ g_return_val_if_fail (value != NULL, FALSE);
entry = get_entry_for_key (key);
g_assert (entry != NULL);
@@ -179,6 +184,7 @@ gdm_settings_direct_get_string (const char *key,
char *str;
g_return_val_if_fail (key != NULL, FALSE);
+ g_return_val_if_fail (value != NULL, FALSE);
entry = get_entry_for_key (key);
g_assert (entry != NULL);
@@ -194,9 +200,7 @@ gdm_settings_direct_get_string (const char *key,
str = g_strdup (gdm_settings_entry_get_default_value (entry));
}
- if (value != NULL) {
- *value = g_strdup (str);
- }
+ *value = g_strdup (str);
g_free (str);