From abfbc768240f740192e00e3c136d37f93bec542d Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 26 Feb 2025 12:05:10 +0100
Subject: [PATCH] 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>
---
 xkb/ddxLoad.c       |  4 ++--
 xkb/maprules.c      | 11 +++--------
 xkb/xkbrules_priv.h |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 8001cb25d..a231e96bf 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -436,14 +436,14 @@ XkbDDXNamesFromRules(DeviceIntPtr keybd,
     if (!XkbRF_LoadRules(file, rules)) {
         LogMessage(X_ERROR, "XKB: Couldn't parse rules file %s\n", rules_name);
         fclose(file);
-        XkbRF_Free(rules, TRUE);
+        XkbRF_Free(rules);
         return FALSE;
     }
 
     memset(names, 0, sizeof(*names));
     complete = XkbRF_GetComponents(rules, defs, names);
     fclose(file);
-    XkbRF_Free(rules, TRUE);
+    XkbRF_Free(rules);
 
     if (!complete)
         LogMessage(X_ERROR, "XKB: Rules returned no components\n");
diff --git a/xkb/maprules.c b/xkb/maprules.c
index b5bdfefc3..222b6107e 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -969,7 +969,7 @@ XkbRF_LoadRules(FILE * file, XkbRF_RulesPtr rules)
 }
 
 void
-XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules)
+XkbRF_Free(XkbRF_RulesPtr rules)
 {
     int i;
     XkbRF_RulePtr rule;
@@ -988,11 +988,8 @@ XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules)
             free((void *) rule->types);
             free((void *) rule->compat);
             free((void *) rule->geometry);
-            memset((char *) rule, 0, sizeof(XkbRF_RuleRec));
         }
         free(rules->rules);
-        rules->num_rules = rules->sz_rules = 0;
-        rules->rules = NULL;
     }
 
     if (rules->groups) {
@@ -1001,10 +998,8 @@ XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules)
             free(group->words);
         }
         free(rules->groups);
-        rules->num_groups = 0;
-        rules->groups = NULL;
     }
-    if (freeRules)
-        free(rules);
+
+    free(rules);
     return;
 }
diff --git a/xkb/xkbrules_priv.h b/xkb/xkbrules_priv.h
index 3739c15a8..deb29d093 100644
--- a/xkb/xkbrules_priv.h
+++ b/xkb/xkbrules_priv.h
@@ -56,6 +56,6 @@ static inline XkbRF_RulesPtr XkbRF_Create(void)
     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 */