From a5d973b9090bab6c313d7edb3c5c722d6a4f6892 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Feb 2025 17:50:18 +0100 Subject: [PATCH] xkb: make XkbFreeGeomKeyAliases() static Only used within one source file. Signed-off-by: Enrico Weigelt, metux IT consult --- xkb/XKBGAlloc.c | 6 +++--- xkb/xkbgeom.h | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c index 3e38cbdb3..0cb5c84bb 100644 --- a/xkb/XKBGAlloc.c +++ b/xkb/XKBGAlloc.c @@ -148,8 +148,8 @@ XkbFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll) /***====================================================================***/ -void -XkbFreeGeomKeyAliases(XkbGeometryPtr geom, int first, int count, Bool freeAll) +static void +SrvXkbFreeGeomKeyAliases(XkbGeometryPtr geom, int first, int count, Bool freeAll) { _XkbFreeGeomLeafElems(freeAll, first, count, &geom->num_key_aliases, &geom->sz_key_aliases, @@ -366,7 +366,7 @@ XkbFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap) geom->num_doodads = geom->sz_doodads = 0; } if ((which & XkbGeomKeyAliasesMask) && (geom->key_aliases != NULL)) - XkbFreeGeomKeyAliases(geom, 0, geom->num_key_aliases, TRUE); + SrvXkbFreeGeomKeyAliases(geom, 0, geom->num_key_aliases, TRUE); if (freeMap) { free(geom->label_font); geom->label_font = NULL; diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h index 1a6a903ab..765a63081 100644 --- a/xkb/xkbgeom.h +++ b/xkb/xkbgeom.h @@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xkbstr.h" -#define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases #define XkbFreeGeomColors SrvXkbFreeGeomColors #define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads #define XkbFreeGeomProperties SrvXkbFreeGeomProperties @@ -343,13 +342,6 @@ XkbDoodadPtr SrvXkbAddGeomDoodad(XkbGeometryPtr geom, XkbSectionPtr section, Atom name); -extern void - XkbFreeGeomKeyAliases(XkbGeometryPtr /* geom */ , - int /* first */ , - int /* count */ , - Bool /* freeAll */ - ); - extern void XkbFreeGeomColors(XkbGeometryPtr /* geom */ , int /* first */ ,