diff options
Diffstat (limited to 'glib/gkeyfile.c')
-rw-r--r-- | glib/gkeyfile.c | 161 |
1 files changed, 86 insertions, 75 deletions
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index 9a4821bc5..1fcef9fc9 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -529,8 +529,6 @@ struct _GKeyFileGroup { const gchar *name; /* NULL for above first group (which will be comments) */ - GKeyFileKeyValuePair *comment; /* Special comment that is stuck to the top of a group */ - GList *key_value_pairs; /* Used in parallel with key_value_pairs for @@ -579,7 +577,8 @@ static void g_key_file_add_key (GKeyFile const gchar *key, const gchar *value); static void g_key_file_add_group (GKeyFile *key_file, - const gchar *group_name); + const gchar *group_name, + gboolean created); static gboolean g_key_file_is_group_name (const gchar *name); static gboolean g_key_file_is_key_name (const gchar *name, gsize len); @@ -638,7 +637,7 @@ G_DEFINE_QUARK (g-key-file-error-quark, g_key_file_error) static void g_key_file_init (GKeyFile *key_file) { - key_file->current_group = g_slice_new0 (GKeyFileGroup); + key_file->current_group = g_new0 (GKeyFileGroup, 1); key_file->groups = g_list_prepend (NULL, key_file->current_group); key_file->group_hash = NULL; key_file->start_group = NULL; @@ -700,7 +699,7 @@ g_key_file_new (void) { GKeyFile *key_file; - key_file = g_slice_new0 (GKeyFile); + key_file = g_new0 (GKeyFile, 1); key_file->ref_count = 1; g_key_file_init (key_file); @@ -1205,7 +1204,7 @@ g_key_file_free (GKeyFile *key_file) g_key_file_clear (key_file); if (g_atomic_int_dec_and_test (&key_file->ref_count)) - g_slice_free (GKeyFile, key_file); + g_free_sized (key_file, sizeof (GKeyFile)); else g_key_file_init (key_file); } @@ -1227,7 +1226,7 @@ g_key_file_unref (GKeyFile *key_file) if (g_atomic_int_dec_and_test (&key_file->ref_count)) { g_key_file_clear (key_file); - g_slice_free (GKeyFile, key_file); + g_free_sized (key_file, sizeof (GKeyFile)); } } @@ -1317,7 +1316,7 @@ g_key_file_parse_comment (GKeyFile *key_file, g_warn_if_fail (key_file->current_group != NULL); - pair = g_slice_new (GKeyFileKeyValuePair); + pair = g_new (GKeyFileKeyValuePair, 1); pair->key = NULL; pair->value = g_strndup (line, length); @@ -1354,7 +1353,7 @@ g_key_file_parse_group (GKeyFile *key_file, return; } - g_key_file_add_group (key_file, group_name); + g_key_file_add_group (key_file, group_name, FALSE); g_free (group_name); } @@ -1442,7 +1441,7 @@ g_key_file_parse_key_value_pair (GKeyFile *key_file, { GKeyFileKeyValuePair *pair; - pair = g_slice_new (GKeyFileKeyValuePair); + pair = g_new (GKeyFileKeyValuePair, 1); pair->key = g_steal_pointer (&key); pair->value = g_strndup (value_start, value_len); @@ -1610,14 +1609,6 @@ g_key_file_to_data (GKeyFile *key_file, group = (GKeyFileGroup *) group_node->data; - /* separate groups by at least an empty line */ - if (data_string->len >= 2 && - data_string->str[data_string->len - 2] != '\n') - g_string_append_c (data_string, '\n'); - - if (group->comment != NULL) - g_string_append_printf (data_string, "%s\n", group->comment->value); - if (group->name != NULL) g_string_append_printf (data_string, "[%s]\n", group->name); @@ -1902,7 +1893,7 @@ g_key_file_set_value (GKeyFile *key_file, if (!group) { - g_key_file_add_group (key_file, group_name); + g_key_file_add_group (key_file, group_name, TRUE); group = (GKeyFileGroup *) key_file->groups->data; g_key_file_add_key (key_file, group, key, value); @@ -3339,7 +3330,7 @@ g_key_file_set_key_comment (GKeyFile *key_file, /* Now we can add our new comment */ - pair = g_slice_new (GKeyFileKeyValuePair); + pair = g_new (GKeyFileKeyValuePair, 1); pair->key = NULL; pair->value = g_key_file_parse_comment_as_value (key_file, comment); @@ -3350,12 +3341,50 @@ g_key_file_set_key_comment (GKeyFile *key_file, } static gboolean +g_key_file_set_top_comment (GKeyFile *key_file, + const gchar *comment, + GError **error) +{ + GList *group_node; + GKeyFileGroup *group; + GKeyFileKeyValuePair *pair; + + /* The last group in the list should be the top (comments only) + * group in the file + */ + g_warn_if_fail (key_file->groups != NULL); + group_node = g_list_last (key_file->groups); + group = (GKeyFileGroup *) group_node->data; + g_warn_if_fail (group->name == NULL); + + /* Note all keys must be comments at the top of + * the file, so we can just free it all. + */ + g_list_free_full (group->key_value_pairs, (GDestroyNotify) g_key_file_key_value_pair_free); + group->key_value_pairs = NULL; + + if (comment == NULL) + return TRUE; + + pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = NULL; + pair->value = g_key_file_parse_comment_as_value (key_file, comment); + + group->key_value_pairs = + g_list_prepend (group->key_value_pairs, pair); + + return TRUE; +} + +static gboolean g_key_file_set_group_comment (GKeyFile *key_file, const gchar *group_name, const gchar *comment, GError **error) { GKeyFileGroup *group; + GList *group_node; + GKeyFileKeyValuePair *pair; g_return_val_if_fail (group_name != NULL && g_key_file_is_group_name (group_name), FALSE); @@ -3370,12 +3399,22 @@ g_key_file_set_group_comment (GKeyFile *key_file, return FALSE; } + if (group == key_file->start_group) + return g_key_file_set_top_comment (key_file, comment, error); + /* First remove any existing comment */ - if (group->comment) + group_node = g_key_file_lookup_group_node (key_file, group_name); + group = group_node->next->data; + for (GList *lp = group->key_value_pairs; lp != NULL; ) { - g_key_file_key_value_pair_free (group->comment); - group->comment = NULL; + GList *lnext = lp->next; + pair = lp->data; + if (pair->key != NULL) + break; + + g_key_file_remove_key_value_pair_node (key_file, group, lp); + lp = lnext; } if (comment == NULL) @@ -3383,45 +3422,10 @@ g_key_file_set_group_comment (GKeyFile *key_file, /* Now we can add our new comment */ - group->comment = g_slice_new (GKeyFileKeyValuePair); - group->comment->key = NULL; - group->comment->value = g_key_file_parse_comment_as_value (key_file, comment); - - return TRUE; -} - -static gboolean -g_key_file_set_top_comment (GKeyFile *key_file, - const gchar *comment, - GError **error) -{ - GList *group_node; - GKeyFileGroup *group; - GKeyFileKeyValuePair *pair; - - /* The last group in the list should be the top (comments only) - * group in the file - */ - g_warn_if_fail (key_file->groups != NULL); - group_node = g_list_last (key_file->groups); - group = (GKeyFileGroup *) group_node->data; - g_warn_if_fail (group->name == NULL); - - /* Note all keys must be comments at the top of - * the file, so we can just free it all. - */ - g_list_free_full (group->key_value_pairs, (GDestroyNotify) g_key_file_key_value_pair_free); - group->key_value_pairs = NULL; - - if (comment == NULL) - return TRUE; - - pair = g_slice_new (GKeyFileKeyValuePair); + pair = g_new (GKeyFileKeyValuePair, 1); pair->key = NULL; pair->value = g_key_file_parse_comment_as_value (key_file, comment); - - group->key_value_pairs = - g_list_prepend (group->key_value_pairs, pair); + group->key_value_pairs = g_list_prepend (group->key_value_pairs, pair); return TRUE; } @@ -3629,9 +3633,6 @@ g_key_file_get_group_comment (GKeyFile *key_file, return NULL; } - if (group->comment) - return g_strdup (group->comment->value); - group_node = g_key_file_lookup_group_node (key_file, group_name); group_node = group_node->next; group = (GKeyFileGroup *)group_node->data; @@ -3826,7 +3827,8 @@ g_key_file_has_key (GKeyFile *key_file, static void g_key_file_add_group (GKeyFile *key_file, - const gchar *group_name) + const gchar *group_name, + gboolean created) { GKeyFileGroup *group; @@ -3840,14 +3842,29 @@ g_key_file_add_group (GKeyFile *key_file, return; } - group = g_slice_new0 (GKeyFileGroup); + group = g_new0 (GKeyFileGroup, 1); group->name = g_strdup (group_name); group->lookup_map = g_hash_table_new (g_str_hash, g_str_equal); key_file->groups = g_list_prepend (key_file->groups, group); key_file->current_group = group; if (key_file->start_group == NULL) - key_file->start_group = group; + { + key_file->start_group = group; + } + else if (!(key_file->flags & G_KEY_FILE_KEEP_COMMENTS) || created) + { + /* separate groups by a blank line if we don't keep comments or group is created */ + GKeyFileGroup *next_group = key_file->groups->next->data; + if (next_group->key_value_pairs == NULL || + ((GKeyFileKeyValuePair *) next_group->key_value_pairs->data)->key != NULL) + { + GKeyFileKeyValuePair *pair = g_new (GKeyFileKeyValuePair, 1); + pair->key = NULL; + pair->value = g_strdup (""); + next_group->key_value_pairs = g_list_prepend (next_group->key_value_pairs, pair); + } + } if (!key_file->group_hash) key_file->group_hash = g_hash_table_new (g_str_hash, g_str_equal); @@ -3862,7 +3879,7 @@ g_key_file_key_value_pair_free (GKeyFileKeyValuePair *pair) { g_free (pair->key); g_free (pair->value); - g_slice_free (GKeyFileKeyValuePair, pair); + g_free_sized (pair, sizeof (GKeyFileKeyValuePair)); } } @@ -3958,12 +3975,6 @@ g_key_file_remove_group_node (GKeyFile *key_file, g_warn_if_fail (group->key_value_pairs == NULL); - if (group->comment) - { - g_key_file_key_value_pair_free (group->comment); - group->comment = NULL; - } - if (group->lookup_map) { g_hash_table_destroy (group->lookup_map); @@ -3971,7 +3982,7 @@ g_key_file_remove_group_node (GKeyFile *key_file, } g_free ((gchar *) group->name); - g_slice_free (GKeyFileGroup, group); + g_free_sized (group, sizeof (GKeyFileGroup)); g_list_free_1 (group_node); } @@ -4031,7 +4042,7 @@ g_key_file_add_key (GKeyFile *key_file, { GKeyFileKeyValuePair *pair; - pair = g_slice_new (GKeyFileKeyValuePair); + pair = g_new (GKeyFileKeyValuePair, 1); pair->key = g_strdup (key); pair->value = g_strdup (value); |