luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-11 03:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't free FileBuilder in serialize function

Browse Source 
It's confused both myself and Jan-Michael, when reviewing my changes to
this code. It's weird for the serialize function to take ownership of
the passed FileBuilder. Don't do that.

We can also add a convenience free function.
This commit is contained in:
Michael Catanzaro 2019-06-22 13:23:09 -05:00
parent a6f0eadb51
commit 0d03b2c6dc
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gvdb-builder.c
View File

@ -450,6 +450,13 @@ file_builder_new (gboolean byteswap)
return builder;
}
static void
file_builder_free (FileBuilder *fb)
{
g_queue_free (fb->chunks);
g_slice_free (FileBuilder, fb);
}
static GString *
file_builder_serialise (FileBuilder *fb,
struct gvdb_pointer root)
@ -494,9 +501,6 @@ file_builder_serialise (FileBuilder *fb,
g_slice_free (FileChunk, chunk);
}
g_queue_free (fb->chunks);
g_slice_free (FileBuilder, fb);
return result;
}
@ -518,6 +522,7 @@ gvdb_table_write_contents (GHashTable *table,
fb = file_builder_new (byteswap);
file_builder_add_hash (fb, table, &root);
str = file_builder_serialise (fb, root);
file_builder_free (fb);
status = g_file_set_contents (filename, str->str, str->len, error);
g_string_free (str, TRUE);
@ -594,6 +599,7 @@ gvdb_table_write_contents_async (GHashTable *table,
file_builder_add_hash (fb, table, &root);
str = file_builder_serialise (fb, root);
bytes = g_string_free_to_bytes (str);
file_builder_free (fb);
file = g_file_new_for_path (filename);
data = write_contents_data_new (bytes, file);