From e38eeb471865b7a7812583d55f8f9991f8a0271a Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 26 Feb 2025 10:28:29 +0100 Subject: [PATCH] xkb: drop unused XkbRF_LoadRulesByName() Not used anywhere, so no need to keep it around any longer. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- include/xkbrules.h | 7 ------- xkb/maprules.c | 31 ------------------------------- 2 files changed, 38 deletions(-) diff --git a/include/xkbrules.h b/include/xkbrules.h index ab5b4b266..8832c01e2 100644 --- a/include/xkbrules.h +++ b/include/xkbrules.h @@ -98,13 +98,6 @@ extern _X_EXPORT Bool XkbRF_LoadRules(FILE * /* file */ , XkbRF_RulesPtr /* rules */ ); -extern _X_EXPORT Bool XkbRF_LoadRulesByName(char * /* base */ , - char * /* locale */ , - XkbRF_RulesPtr /* rules */ - ); - -/***====================================================================***/ - extern _X_EXPORT XkbRF_RulesPtr XkbRF_Create(void); extern _X_EXPORT void XkbRF_Free(XkbRF_RulesPtr /* rules */ , diff --git a/xkb/maprules.c b/xkb/maprules.c index 0b6c107ae..a324c67a0 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -963,37 +963,6 @@ XkbRF_LoadRules(FILE * file, XkbRF_RulesPtr rules) return TRUE; } -Bool -XkbRF_LoadRulesByName(char *base, char *locale, XkbRF_RulesPtr rules) -{ - FILE *file; - char buf[PATH_MAX]; - Bool ok; - - if ((!base) || (!rules)) - return FALSE; - if (locale) { - if (snprintf(buf, PATH_MAX, "%s-%s", base, locale) >= PATH_MAX) - return FALSE; - } - else { - if (strlen(base) + 1 > PATH_MAX) - return FALSE; - strcpy(buf, base); - } - - file = fopen(buf, "r"); - if ((!file) && (locale)) { /* fallback if locale was specified */ - strcpy(buf, base); - file = fopen(buf, "r"); - } - if (!file) - return FALSE; - ok = XkbRF_LoadRules(file, rules); - fclose(file); - return ok; -} - /***====================================================================***/ XkbRF_RulesPtr