luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert addition of g_key_file_has_key_full

Browse Source 
Per IRC discussion, we can just ask bindings to use
g_key_file_get_value() to test for the existence of a key.

I left the "fixed" code in the source tree as static because it makes
more sense to me.
This commit is contained in:
Colin Walters 2011-07-22 10:31:27 -04:00
parent 7539483169
commit 8b061e023c
3 changed files with 46 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
glib/gkeyfile.c
View File

@ -3136,67 +3136,10 @@ g_key_file_has_group (GKeyFile *key_file,
return g_key_file_lookup_group (key_file, group_name) != NULL;
}
/**
* g_key_file_has_key: (skip)
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key name
* @error: return location for a #GError
*
* Looks whether the key file has the key @key in the group
* @group_name.
*
* <note>This function does not follow the rules for #GError strictly;
* the return value both carries meaning and signals an error. To use
* this function, you must pass a #GError pointer in @error, and check
* whether it is not %NULL to see if an error occurred.</note>
*
* See g_key_file_has_key_full() for a replacement function which does
* follow the #GError rules.
*
* Return value: %TRUE if @key is a part of @group_name, %FALSE
* otherwise.
*
* Since: 2.6
**/
gboolean
g_key_file_has_key (GKeyFile *key_file,
const gchar *group_name,
const gchar *key,
GError **error)
{
GError *temp_error = NULL;
gboolean has_key;
if (g_key_file_has_key_full (key_file, group_name, key, &has_key, &temp_error))
{
return has_key;
}
else
{
g_propagate_error (error, temp_error);
return FALSE;
}
}
/**
* g_key_file_has_key_full:
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key name
* @has_key: (out) (allow-none): Return location for whether or not key exists
* @error: return location for a #GError
*
* Looks whether the key file has the key @key in the group
* @group_name.
*
* Return value: %TRUE if a group with the name @group_name
* exists. Otherwise, @error is set and %FALSE is returned.
*
* Rename to: g_key_file_has_key
* Since: 2.30
/* This code remains from a historical attempt to add a new public API
* which respects the GError rules.
*/
gboolean
static gboolean
g_key_file_has_key_full (GKeyFile *key_file,
const gchar *group_name,
const gchar *key,
@ -3229,6 +3172,49 @@ g_key_file_has_key_full (GKeyFile *key_file,
return TRUE;
}
/**
* g_key_file_has_key: (skip)
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key name
* @error: return location for a #GError
*
* Looks whether the key file has the key @key in the group
* @group_name.
*
* <note>This function does not follow the rules for #GError strictly;
* the return value both carries meaning and signals an error. To use
* this function, you must pass a #GError pointer in @error, and check
* whether it is not %NULL to see if an error occurred.</note>
*
* Language bindings should use g_key_file_get_value() to test whether
* or not a key exists.
*
* Return value: %TRUE if @key is a part of @group_name, %FALSE
* otherwise.
*
* Since: 2.6
**/
gboolean
g_key_file_has_key (GKeyFile *key_file,
const gchar *group_name,
const gchar *key,
GError **error)
{
GError *temp_error = NULL;
gboolean has_key;
if (g_key_file_has_key_full (key_file, group_name, key, &has_key, &temp_error))
{
return has_key;
}
else
{
g_propagate_error (error, temp_error);
return FALSE;
}
}
static void
g_key_file_add_group (GKeyFile *key_file,
const gchar *group_name)

5
glib/gkeyfile.h
View File

@ -94,11 +94,6 @@ gboolean g_key_file_has_key (GKeyFile *key_file,
const gchar *group_name,
const gchar *key,
GError **error);
gboolean g_key_file_has_key_full (GKeyFile *key_file,
const gchar *group_name,
const gchar *key,
gboolean *has_key,
GError **error);
gchar *g_key_file_get_value (GKeyFile *key_file,
const gchar *group_name,
const gchar *key,

16
glib/tests/keyfile.c
View File

@ -444,7 +444,6 @@ test_listing (void)
gsize len;
gchar *start;
GError *error = NULL;
gboolean has_key;
const gchar *data =
"[group1]\n"
@ -497,21 +496,6 @@ test_listing (void)
g_key_file_has_key (keyfile, "no-such-group", "key", &error);
check_error (&error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND);
g_assert (g_key_file_has_key_full (keyfile, "group1", "key1", &has_key, &error));
check_no_error (&error);
g_assert (has_key);
g_assert (g_key_file_has_key_full (keyfile, "group2", "key3", &has_key, &error));
check_no_error (&error);
g_assert (has_key);
g_assert (g_key_file_has_key_full (keyfile, "group2", "no-such-key", &has_key, &error));
g_assert (!has_key);
check_no_error (&error);
g_assert (!g_key_file_has_key_full (keyfile, "no-such-group", "key", &has_key, &error));
check_error (&error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND);
g_key_file_free (keyfile);
}