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

xkb: make XkbFreeGeomProperties() static 

Only used within one source file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-28 17:55:10 +01:00 committed by Enrico Weigelt, metux IT consult .
parent 7b089d63a3
commit 67c7bd5064
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xkb/XKBGAlloc.c
View File

@ -139,8 +139,8 @@ _XkbClearProperty(char *prop_in)
return; return;
} }
void static void
XkbFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll) SrvXkbFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll)
{ {
_XkbFreeGeomNonLeafElems(freeAll, first, count, _XkbFreeGeomNonLeafElems(freeAll, first, count,
&geom->num_properties, &geom->sz_properties, &geom->num_properties, &geom->sz_properties,
@ -356,7 +356,7 @@ XkbFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap)
if (freeMap) if (freeMap)
which = XkbGeomAllMask; which = XkbGeomAllMask;
if ((which & XkbGeomPropertiesMask) && (geom->properties != NULL)) if ((which & XkbGeomPropertiesMask) && (geom->properties != NULL))
XkbFreeGeomProperties(geom, 0, geom->num_properties, TRUE); SrvXkbFreeGeomProperties(geom, 0, geom->num_properties, TRUE);
if ((which & XkbGeomColorsMask) && (geom->colors != NULL)) if ((which & XkbGeomColorsMask) && (geom->colors != NULL))
SrvXkbFreeGeomColors(geom, 0, geom->num_colors, TRUE); SrvXkbFreeGeomColors(geom, 0, geom->num_colors, TRUE);
if ((which & XkbGeomShapesMask) && (geom->shapes != NULL)) if ((which & XkbGeomShapesMask) && (geom->shapes != NULL))

8
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h" #include "xkbstr.h"
#define XkbFreeGeomProperties SrvXkbFreeGeomProperties
#define XkbFreeGeomKeys SrvXkbFreeGeomKeys #define XkbFreeGeomKeys SrvXkbFreeGeomKeys
#define XkbFreeGeomRows SrvXkbFreeGeomRows #define XkbFreeGeomRows SrvXkbFreeGeomRows
#define XkbFreeGeomSections SrvXkbFreeGeomSections #define XkbFreeGeomSections SrvXkbFreeGeomSections
@ -340,13 +339,6 @@ XkbDoodadPtr SrvXkbAddGeomDoodad(XkbGeometryPtr geom,
XkbSectionPtr section, XkbSectionPtr section,
Atom name); Atom name);
extern void
XkbFreeGeomProperties(XkbGeometryPtr /* geom */ ,
int /* first */ ,
int /* count */ ,
Bool /* freeAll */
);
extern void extern void
XkbFreeGeomOverlayKeys(XkbOverlayRowPtr /* row */ , XkbFreeGeomOverlayKeys(XkbOverlayRowPtr /* row */ ,
int /* first */ , int /* first */ ,