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

xkb: make XkbFreeGeomColors() 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:51:05 +01:00 committed by Enrico Weigelt, metux IT consult .
parent a5d973b909
commit 08614fc33e
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

@ -168,8 +168,8 @@ _XkbClearColor(char *color_in)
return; return;
} }
void static void
XkbFreeGeomColors(XkbGeometryPtr geom, int first, int count, Bool freeAll) SrvXkbFreeGeomColors(XkbGeometryPtr geom, int first, int count, Bool freeAll)
{ {
_XkbFreeGeomNonLeafElems(freeAll, first, count, _XkbFreeGeomNonLeafElems(freeAll, first, count,
&geom->num_colors, &geom->sz_colors, &geom->num_colors, &geom->sz_colors,
@ -355,7 +355,7 @@ XkbFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap)
if ((which & XkbGeomPropertiesMask) && (geom->properties != NULL)) if ((which & XkbGeomPropertiesMask) && (geom->properties != NULL))
XkbFreeGeomProperties(geom, 0, geom->num_properties, TRUE); XkbFreeGeomProperties(geom, 0, geom->num_properties, TRUE);
if ((which & XkbGeomColorsMask) && (geom->colors != NULL)) if ((which & XkbGeomColorsMask) && (geom->colors != NULL))
XkbFreeGeomColors(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))
XkbFreeGeomShapes(geom, 0, geom->num_shapes, TRUE); XkbFreeGeomShapes(geom, 0, geom->num_shapes, TRUE);
if ((which & XkbGeomSectionsMask) && (geom->sections != NULL)) if ((which & XkbGeomSectionsMask) && (geom->sections != 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 XkbFreeGeomColors SrvXkbFreeGeomColors
#define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads #define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads
#define XkbFreeGeomProperties SrvXkbFreeGeomProperties #define XkbFreeGeomProperties SrvXkbFreeGeomProperties
#define XkbFreeGeomKeys SrvXkbFreeGeomKeys #define XkbFreeGeomKeys SrvXkbFreeGeomKeys
@ -342,13 +341,6 @@ XkbDoodadPtr SrvXkbAddGeomDoodad(XkbGeometryPtr geom,
XkbSectionPtr section, XkbSectionPtr section,
Atom name); Atom name);
extern void
XkbFreeGeomColors(XkbGeometryPtr /* geom */ ,
int /* first */ ,
int /* count */ ,
Bool /* freeAll */
);
extern void extern void
XkbFreeGeomDoodads(XkbDoodadPtr /* doodads */ , XkbFreeGeomDoodads(XkbDoodadPtr /* doodads */ ,
int /* nDoodads */ , int /* nDoodads */ ,