StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

registry: Use `steal` for better memory handling

master
Pierre Le Marre 2023-11-21 08:50:38 +01:00 committed by Peter Hutterer
parent dbc187cfa1
commit 20c6fa62a7
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -364,6 +364,7 @@ if get_option('enable-xkbregistry')
'src/utils.c', 'src/utils.c',
'src/util-list.h', 'src/util-list.h',
'src/util-list.c', 'src/util-list.c',
'src/util-mem.h',
] ]
libxkbregistry_link_args = [] libxkbregistry_link_args = []
libxkbregistry_link_deps = [] libxkbregistry_link_deps = []

27
src/registry.c
View File

@ -34,6 +34,7 @@
#include "xkbcommon/xkbregistry.h" #include "xkbcommon/xkbregistry.h"
#include "utils.h" #include "utils.h"
#include "util-list.h" #include "util-list.h"
#include "util-mem.h"
struct rxkb_object; struct rxkb_object;
@ -803,9 +804,9 @@ parse_model(struct rxkb_context *ctx, xmlNode *model,
/* new model */ /* new model */
m = rxkb_model_create(&ctx->base); m = rxkb_model_create(&ctx->base);
m->name = config.name; m->name = steal(&config.name);
m->description = config.description; m->description = steal(&config.description);
m->vendor = config.vendor; m->vendor = steal(&config.vendor);
m->popularity = config.popularity; m->popularity = config.popularity;
list_append(&ctx->models, &m->base.link); list_append(&ctx->models, &m->base.link);
} }
@ -894,10 +895,10 @@ parse_variant(struct rxkb_context *ctx, struct rxkb_layout *l,
list_init(&v->iso639s); list_init(&v->iso639s);
list_init(&v->iso3166s); list_init(&v->iso3166s);
v->name = strdup(l->name); v->name = strdup(l->name);
v->variant = config.name; v->variant = steal(&config.name);
v->description = config.description; v->description = steal(&config.description);
// if variant omits brief, inherit from parent layout. // if variant omits brief, inherit from parent layout.
v->brief = config.brief == NULL ? strdup_safe(l->brief) : config.brief; v->brief = config.brief == NULL ? strdup_safe(l->brief) : steal(&config.brief);
v->popularity = config.popularity; v->popularity = config.popularity;
list_append(&ctx->layouts, &v->base.link); list_append(&ctx->layouts, &v->base.link);
@ -979,10 +980,10 @@ parse_layout(struct rxkb_context *ctx, xmlNode *layout,
l = rxkb_layout_create(&ctx->base); l = rxkb_layout_create(&ctx->base);
list_init(&l->iso639s); list_init(&l->iso639s);
list_init(&l->iso3166s); list_init(&l->iso3166s);
l->name = config.name; l->name = steal(&config.name);
l->variant = NULL; l->variant = NULL;
l->description = config.description; l->description = steal(&config.description);
l->brief = config.brief; l->brief = steal(&config.brief);
l->popularity = config.popularity; l->popularity = config.popularity;
list_append(&ctx->layouts, &l->base.link); list_append(&ctx->layouts, &l->base.link);
} else { } else {
@ -1034,8 +1035,8 @@ parse_option(struct rxkb_context *ctx, struct rxkb_option_group *group,
} }
o = rxkb_option_create(&group->base); o = rxkb_option_create(&group->base);
o->name = config.name; o->name = steal(&config.name);
o->description = config.description; o->description = steal(&config.description);
o->popularity = config.popularity; o->popularity = config.popularity;
list_append(&group->options, &o->base.link); list_append(&group->options, &o->base.link);
} }
@ -1063,8 +1064,8 @@ parse_group(struct rxkb_context *ctx, xmlNode *group,
if (!exists) { if (!exists) {
g = rxkb_option_group_create(&ctx->base); g = rxkb_option_group_create(&ctx->base);
g->name = config.name; g->name = steal(&config.name);
g->description = config.description; g->description = steal(&config.description);
g->popularity = config.popularity; g->popularity = config.popularity;
multiple = xmlGetProp(group, (const xmlChar*)"allowMultipleSelection"); multiple = xmlGetProp(group, (const xmlChar*)"allowMultipleSelection");