frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: drop obsolete parameter from XkbRF_Free() 

The freeRules parameter is always set to TRUE, meaning always free the
XkbRF_RulesRec struct. Therefore also no need to clear out fields that
aren't going to be reused again, ever.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1840>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-26 12:05:10 +01:00 committed by Marge Bot
parent a88b17565b
commit abfbc76824
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xkb/ddxLoad.c
View File

@ -436,14 +436,14 @@ XkbDDXNamesFromRules(DeviceIntPtr keybd,
if (!XkbRF_LoadRules(file, rules)) { if (!XkbRF_LoadRules(file, rules)) {
LogMessage(X_ERROR, "XKB: Couldn't parse rules file %s\n", rules_name); LogMessage(X_ERROR, "XKB: Couldn't parse rules file %s\n", rules_name);
fclose(file); fclose(file);
XkbRF_Free(rules, TRUE); XkbRF_Free(rules);
return FALSE; return FALSE;
} }
memset(names, 0, sizeof(*names)); memset(names, 0, sizeof(*names));
complete = XkbRF_GetComponents(rules, defs, names); complete = XkbRF_GetComponents(rules, defs, names);
fclose(file); fclose(file);
XkbRF_Free(rules, TRUE); XkbRF_Free(rules);
if (!complete) if (!complete)
LogMessage(X_ERROR, "XKB: Rules returned no components\n"); LogMessage(X_ERROR, "XKB: Rules returned no components\n");

11
xkb/maprules.c
View File

@ -969,7 +969,7 @@ XkbRF_LoadRules(FILE * file, XkbRF_RulesPtr rules)
} }
void void
XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules) XkbRF_Free(XkbRF_RulesPtr rules)
{ {
int i; int i;
XkbRF_RulePtr rule; XkbRF_RulePtr rule;
@ -988,11 +988,8 @@ XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules)
free((void *) rule->types); free((void *) rule->types);
free((void *) rule->compat); free((void *) rule->compat);
free((void *) rule->geometry); free((void *) rule->geometry);
memset((char *) rule, 0, sizeof(XkbRF_RuleRec));
} }
free(rules->rules); free(rules->rules);
rules->num_rules = rules->sz_rules = 0;
rules->rules = NULL;
} }
if (rules->groups) { if (rules->groups) {
@ -1001,10 +998,8 @@ XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules)
free(group->words); free(group->words);
} }
free(rules->groups); free(rules->groups);
rules->num_groups = 0;
rules->groups = NULL;
} }
if (freeRules)
free(rules); free(rules);
return; return;
} }

2
xkb/xkbrules_priv.h
View File

@ -56,6 +56,6 @@ static inline XkbRF_RulesPtr XkbRF_Create(void)
return calloc(1, sizeof(XkbRF_RulesRec)); return calloc(1, sizeof(XkbRF_RulesRec));
} }
void XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules); void XkbRF_Free(XkbRF_RulesPtr rules);
#endif /* _XSERVER_XKB_XKBRULES_PRIV_H */ #endif /* _XSERVER_XKB_XKBRULES_PRIV_H */