From 38af236446a92f3ce86217ab50945faaa0ceee42 Mon Sep 17 00:00:00 2001 From: alexhudson Date: Sun, 17 Oct 2010 11:34:52 +0000 Subject: [PATCH] Free ptr arrays manually; requires glib > 2.22 otherwise :( --- src/agents/store/query-builder.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/agents/store/query-builder.c b/src/agents/store/query-builder.c index 304d7ae..de8925c 100644 --- a/src/agents/store/query-builder.c +++ b/src/agents/store/query-builder.c @@ -30,9 +30,9 @@ QueryBuilderStart(QueryBuilder *builder) builder->order_direction = ORDER_NONE; builder->output_mode = MODE_COLLECTIONS; - builder->properties = g_ptr_array_new_with_free_func(g_free); - builder->links = g_ptr_array_new_with_free_func(g_free); - builder->parameters = g_ptr_array_new_with_free_func(g_free); + builder->properties = g_ptr_array_new(); + builder->links = g_ptr_array_new(); + builder->parameters = g_ptr_array_new(); return 0; } @@ -48,8 +48,13 @@ QueryBuilderFinish(QueryBuilder *builder) QueryParserFinish(&builder->external_parser); /* free all the properties, links and parameters */ + g_ptr_array_foreach (builder->properties, (GFunc)g_free, NULL); g_ptr_array_free(builder->properties, TRUE); + + g_ptr_array_foreach (builder->links, (GFunc)g_free, NULL); g_ptr_array_free(builder->links, TRUE); + + g_ptr_array_foreach (builder->parameters, (GFunc)g_free, NULL); g_ptr_array_free(builder->parameters, TRUE); }