From 220b86f119783dcccb367d5047f4c7a9d0f017b1 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 28 Feb 2025 17:58:35 +0100 Subject: [PATCH] xkb: make XkbFreeGeomSections() 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 d09fbc4c7..207953edf 100644 --- a/xkb/XKBGAlloc.c +++ b/xkb/XKBGAlloc.c @@ -296,8 +296,8 @@ _XkbClearSection(char *section_in) return; } -void -XkbFreeGeomSections(XkbGeometryPtr geom, int first, int count, Bool freeAll) +static void +SrvXkbFreeGeomSections(XkbGeometryPtr geom, int first, int count, Bool freeAll) { _XkbFreeGeomNonLeafElems(freeAll, first, count, &geom->num_sections, &geom->sz_sections, @@ -362,7 +362,7 @@ XkbFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap) if ((which & XkbGeomShapesMask) && (geom->shapes != NULL)) XkbFreeGeomShapes(geom, 0, geom->num_shapes, TRUE); if ((which & XkbGeomSectionsMask) && (geom->sections != NULL)) - XkbFreeGeomSections(geom, 0, geom->num_sections, TRUE); + SrvXkbFreeGeomSections(geom, 0, geom->num_sections, TRUE); if ((which & XkbGeomDoodadsMask) && (geom->doodads != NULL)) { SrvXkbFreeGeomDoodads(geom->doodads, geom->num_doodads, TRUE); geom->doodads = NULL; diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h index 433b900bd..b4c41dd75 100644 --- a/xkb/xkbgeom.h +++ b/xkb/xkbgeom.h @@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xkbstr.h" -#define XkbFreeGeomSections SrvXkbFreeGeomSections #define XkbFreeGeomPoints SrvXkbFreeGeomPoints #define XkbFreeGeomOutlines SrvXkbFreeGeomOutlines #define XkbFreeGeomShapes SrvXkbFreeGeomShapes @@ -358,13 +357,6 @@ extern void Bool /* freeAll */ ); -extern void - XkbFreeGeomSections(XkbGeometryPtr /* geom */ , - int /* first */ , - int /* count */ , - Bool /* freeAll */ - ); - extern void XkbFreeGeomPoints(XkbOutlinePtr /* outline */ , int /* first */ ,