Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

builder: Use g_slice_free_chain() for strings in precompile

Browse Source
This commit is contained in:
Garrett Regier
2021-09-23 15:26:56 -07:00
committed by Matthias Clasen
parent 9c12b58e32
commit fcb6adaaaa
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkbuilderprecompile.c
View File

@@ -34,13 +34,15 @@ typedef enum
/* All strings are owned by the string chunk */
typedef struct {
/* Must be first for g_slice_free_chain() */
GList link;
const char *string;
int len;
int count;
int offset;
int text_offset;
gboolean include_len;
GList link;
} RecordDataString;
typedef struct {
@@ -153,12 +155,6 @@ record_data_node_free (RecordDataNode *node)
}
}
static void
record_data_string_free (RecordDataString *s)
{
g_slice_free (RecordDataString, s);
}
static gboolean
record_data_string_equal (gconstpointer _a,
gconstpointer _b)
@@ -435,8 +431,7 @@ _gtk_buildable_parser_precompile (const char *text,
GString *marshaled;
int offset;
data.strings = g_hash_table_new_full (record_data_string_hash, record_data_string_equal,
(GDestroyNotify)record_data_string_free, NULL);
data.strings = g_hash_table_new (record_data_string_hash, record_data_string_equal);
data.chunks = g_string_chunk_new (512);
data.root = record_data_element_new (NULL, NULL, 0);
data.current = data.root;
@@ -489,6 +484,9 @@ _gtk_buildable_parser_precompile (const char *text,
marshal_root (marshaled, &data.root->base);
g_slice_free_chain (RecordDataString,
(RecordDataString *)data.string_list.head,
link.next);
record_data_node_free (&data.root->base);
g_string_chunk_free (data.chunks);
g_hash_table_destroy (data.strings);