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

Merge pull request #1970 from cgwalters/keyfile-group-not-found 

lib/keyfile: Treat "group not found" the same as "key not found"
This commit is contained in:
OpenShift Merge Robot 2019-11-07 22:47:40 +01:00 committed by GitHub
parent cb3eff6cfa 58980a717a
commit 49513ccc1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,13 @@
#include <string.h> #include <string.h>
static gboolean
is_notfound (GError *error)
{
return g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)
|| g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND);
}
gboolean gboolean
ot_keyfile_get_boolean_with_default (GKeyFile *keyfile, ot_keyfile_get_boolean_with_default (GKeyFile *keyfile,
const char *section, const char *section,
@ -43,7 +50,7 @@ ot_keyfile_get_boolean_with_default (GKeyFile *keyfile,
gboolean ret_bool = g_key_file_get_boolean (keyfile, section, value, &temp_error); gboolean ret_bool = g_key_file_get_boolean (keyfile, section, value, &temp_error);
if (temp_error) if (temp_error)
{ {
if (g_error_matches (temp_error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) if (is_notfound (temp_error))
{ {
g_clear_error (&temp_error); g_clear_error (&temp_error);
ret_bool = default_value; ret_bool = default_value;
@ -75,7 +82,7 @@ ot_keyfile_get_value_with_default (GKeyFile *keyfile,
g_autofree char *ret_value = g_key_file_get_value (keyfile, section, value, &temp_error); g_autofree char *ret_value = g_key_file_get_value (keyfile, section, value, &temp_error);
if (temp_error) if (temp_error)
{ {
if (g_error_matches (temp_error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) if (is_notfound (temp_error))
{ {
g_clear_error (&temp_error); g_clear_error (&temp_error);
g_assert (ret_value == NULL); g_assert (ret_value == NULL);
@ -206,8 +213,7 @@ ot_keyfile_get_string_list_with_default (GKeyFile *keyfile,
if (temp_error) if (temp_error)
{ {
if (g_error_matches (temp_error, G_KEY_FILE_ERROR, if (is_notfound (temp_error))
G_KEY_FILE_ERROR_KEY_NOT_FOUND))
{ {
g_clear_error (&temp_error); g_clear_error (&temp_error);
ret_value = g_strdupv (default_value); ret_value = g_strdupv (default_value);

26
tests/test-keyfile-utils.c
View File

@ -60,12 +60,12 @@ test_get_boolean_with_default (void)
g_assert_true (out); g_assert_true (out);
g_clear_error (&error); g_clear_error (&error);
g_assert_false (ot_keyfile_get_boolean_with_default (g_keyfile, g_assert (ot_keyfile_get_boolean_with_default (g_keyfile,
"a_fake_section", "a_fake_section",
"a_boolean_true", "a_boolean_true",
FALSE, FALSE,
&out, &out,
&error)); &error));
} }
static void static void
@ -122,13 +122,13 @@ test_get_value_with_default (void)
g_assert_cmpstr (out, ==, "correct"); g_assert_cmpstr (out, ==, "correct");
g_clear_pointer (&out, g_free); g_clear_pointer (&out, g_free);
g_assert_false (ot_keyfile_get_value_with_default (g_keyfile, g_assert (ot_keyfile_get_value_with_default (g_keyfile,
"a_fake_section", "a_fake_section",
"a_value_true", "a_value_true",
"no value", "no value",
&out, &out,
&error)); &error));
g_clear_error (&error); g_assert_cmpstr (out, ==, "no value");
g_clear_pointer (&out, g_free); g_clear_pointer (&out, g_free);
} }