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

girepository/girparser: Move dependencies ownership to each module

Browse Source 
In this way the module can survive without that the parser is fully
alive.

At the moment a module has not a ref-count system, but this makes things
clearer when we return the module from a parser.
This commit is contained in:
Marco Trevisan (Treviño) 2024-05-10 18:08:26 +02:00 committed by Philip Withnall
parent 9d65076eba
commit 6e38293fec
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
girepository/girmodule-private.h
View File

@ -47,7 +47,7 @@ struct _GIIrModule
char *version; char *version;
char *shared_library; char *shared_library;
char *c_prefix; char *c_prefix;
GList *dependencies; GList *dependencies; /* (owned) */
GList *entries; GList *entries;
/* All modules that are included directly or indirectly */ /* All modules that are included directly or indirectly */

2
girepository/girmodule.c
View File

@ -83,7 +83,7 @@ gi_ir_module_free (GIIrModule *module)
gi_ir_node_free ((GIIrNode *)e->data); gi_ir_node_free ((GIIrNode *)e->data);
g_list_free (module->entries); g_list_free (module->entries);
/* Don't free dependencies, we inherit that from the parser */ g_clear_list (&module->dependencies, g_free);
g_list_free (module->include_modules); g_list_free (module->include_modules);

5
girepository/girparser.c
View File

@ -3194,7 +3194,9 @@ start_element_handler (GMarkupParseContext *context,
ctx->include_modules = NULL; ctx->include_modules = NULL;
ctx->modules = g_list_append (ctx->modules, ctx->current_module); ctx->modules = g_list_append (ctx->modules, ctx->current_module);
ctx->current_module->dependencies = ctx->dependencies; g_clear_list (&ctx->current_module->dependencies, g_free);
ctx->current_module->dependencies =
g_list_copy_deep (ctx->dependencies, (GCopyFunc) g_strdup, NULL);
state_switch (ctx, STATE_NAMESPACE); state_switch (ctx, STATE_NAMESPACE);
goto out; goto out;
@ -3824,6 +3826,7 @@ gi_ir_parser_parse_string (GIIrParser *parser,
} }
g_clear_slist (&ctx.node_stack, NULL); g_clear_slist (&ctx.node_stack, NULL);
g_clear_list (&ctx.dependencies, g_free);
g_markup_parse_context_free (context); g_markup_parse_context_free (context);
if (ctx.modules) if (ctx.modules)