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

keyfile: Only allocate group_hash if needed

Browse Source 
A keyfile with no groups (e.g. an empty one) does not need a hash table
for the groups.
This commit is contained in:
Timm Bäder 2020-12-31 11:58:50 +01:00
parent 3ee05ef3bd
commit 89f12e10b6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glib/gkeyfile.c
View File

@ -631,7 +631,7 @@ g_key_file_init (GKeyFile *key_file)
{ {
key_file->current_group = g_slice_new0 (GKeyFileGroup); key_file->current_group = g_slice_new0 (GKeyFileGroup);
key_file->groups = g_list_prepend (NULL, key_file->current_group); key_file->groups = g_list_prepend (NULL, key_file->current_group);
key_file->group_hash = g_hash_table_new (g_str_hash, g_str_equal); key_file->group_hash = NULL;
key_file->start_group = NULL; key_file->start_group = NULL;
key_file->parse_buffer = NULL; key_file->parse_buffer = NULL;
key_file->list_separator = ';'; key_file->list_separator = ';';
@ -3837,6 +3837,9 @@ g_key_file_add_group (GKeyFile *key_file,
if (key_file->start_group == NULL) if (key_file->start_group == NULL)
key_file->start_group = group; key_file->start_group = group;
if (!key_file->group_hash)
key_file->group_hash = g_hash_table_new (g_str_hash, g_str_equal);
g_hash_table_insert (key_file->group_hash, (gpointer)group->name, group); g_hash_table_insert (key_file->group_hash, (gpointer)group->name, group);
} }
@ -3889,7 +3892,10 @@ g_key_file_remove_group_node (GKeyFile *key_file,
group = (GKeyFileGroup *) group_node->data; group = (GKeyFileGroup *) group_node->data;
if (group->name) if (group->name)
{
g_assert (key_file->group_hash);
g_hash_table_remove (key_file->group_hash, group->name); g_hash_table_remove (key_file->group_hash, group->name);
}
/* If the current group gets deleted make the current group the last /* If the current group gets deleted make the current group the last
* added group. * added group.
@ -4095,6 +4101,9 @@ static GKeyFileGroup *
g_key_file_lookup_group (GKeyFile *key_file, g_key_file_lookup_group (GKeyFile *key_file,
const gchar *group_name) const gchar *group_name)
{ {
if (!key_file->group_hash)
return NULL;
return (GKeyFileGroup *)g_hash_table_lookup (key_file->group_hash, group_name); return (GKeyFileGroup *)g_hash_table_lookup (key_file->group_hash, group_name);
} }