packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ot_keyfile_copy_group: return FALSE on invalid inputs 

The function returns a gboolean, replace g_return_if_fail with
g_return_val_if_fail.

Add similar checks to the other functions.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-03-05 14:40:00 +01:00
parent bfd92653c3
commit 021c55f430
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libotutil/ot-keyfile-utils.c
View File

@ -38,6 +38,10 @@ ot_keyfile_get_boolean_with_default (GKeyFile *keyfile,
GError *temp_error = NULL; GError *temp_error = NULL;
gboolean ret_bool; gboolean ret_bool;
g_return_val_if_fail (keyfile != NULL, ret);
g_return_val_if_fail (section != NULL, ret);
g_return_val_if_fail (value != NULL, ret);
ret_bool = g_key_file_get_boolean (keyfile, section, value, &temp_error); ret_bool = g_key_file_get_boolean (keyfile, section, value, &temp_error);
if (temp_error) if (temp_error)
{ {
@ -71,6 +75,10 @@ ot_keyfile_get_value_with_default (GKeyFile *keyfile,
GError *temp_error = NULL; GError *temp_error = NULL;
gs_free char *ret_value = NULL; gs_free char *ret_value = NULL;
g_return_val_if_fail (keyfile != NULL, ret);
g_return_val_if_fail (section != NULL, ret);
g_return_val_if_fail (value != NULL, ret);
ret_value = g_key_file_get_value (keyfile, section, value, &temp_error); ret_value = g_key_file_get_value (keyfile, section, value, &temp_error);
if (temp_error) if (temp_error)
{ {
@ -101,9 +109,9 @@ ot_keyfile_copy_group (GKeyFile *source_keyfile,
gsize length, ii; gsize length, ii;
gboolean ret = FALSE; gboolean ret = FALSE;
g_return_if_fail (source_keyfile != NULL); g_return_val_if_fail (source_keyfile != NULL, ret);
g_return_if_fail (target_keyfile != NULL); g_return_val_if_fail (target_keyfile != NULL, ret);
g_return_if_fail (group_name != NULL); g_return_val_if_fail (group_name != NULL, ret);
keys = g_key_file_get_keys (source_keyfile, group_name, &length, NULL); keys = g_key_file_get_keys (source_keyfile, group_name, &length, NULL);