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

xkb: make XkbFreeGeomDoodads() 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:54:21 +01:00 committed by Enrico Weigelt, metux IT consult .
parent 08614fc33e
commit 7b089d63a3
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xkb/XKBGAlloc.c
View File

@ -34,6 +34,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <xkbsrv.h> #include <xkbsrv.h>
#include "xkbgeom.h" #include "xkbgeom.h"
static void
SrvXkbFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll);
/***====================================================================***/ /***====================================================================***/
static void static void
@ -287,7 +290,7 @@ _XkbClearSection(char *section_in)
if (section->rows != NULL) if (section->rows != NULL)
XkbFreeGeomRows(section, 0, section->num_rows, TRUE); XkbFreeGeomRows(section, 0, section->num_rows, TRUE);
if (section->doodads != NULL) { if (section->doodads != NULL) {
XkbFreeGeomDoodads(section->doodads, section->num_doodads, TRUE); SrvXkbFreeGeomDoodads(section->doodads, section->num_doodads, TRUE);
section->doodads = NULL; section->doodads = NULL;
} }
return; return;
@ -329,8 +332,8 @@ _XkbClearDoodad(char *doodad_in)
return; return;
} }
void static void
XkbFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll) SrvXkbFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll)
{ {
register int i; register int i;
register XkbDoodadPtr doodad; register XkbDoodadPtr doodad;
@ -361,7 +364,7 @@ XkbFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap)
if ((which & XkbGeomSectionsMask) && (geom->sections != NULL)) if ((which & XkbGeomSectionsMask) && (geom->sections != NULL))
XkbFreeGeomSections(geom, 0, geom->num_sections, TRUE); XkbFreeGeomSections(geom, 0, geom->num_sections, TRUE);
if ((which & XkbGeomDoodadsMask) && (geom->doodads != NULL)) { if ((which & XkbGeomDoodadsMask) && (geom->doodads != NULL)) {
XkbFreeGeomDoodads(geom->doodads, geom->num_doodads, TRUE); SrvXkbFreeGeomDoodads(geom->doodads, geom->num_doodads, TRUE);
geom->doodads = NULL; geom->doodads = NULL;
geom->num_doodads = geom->sz_doodads = 0; geom->num_doodads = geom->sz_doodads = 0;
} }

7
xkb/xkbgeom.h
View File

@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "xkbstr.h" #include "xkbstr.h"
#define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads
#define XkbFreeGeomProperties SrvXkbFreeGeomProperties #define XkbFreeGeomProperties SrvXkbFreeGeomProperties
#define XkbFreeGeomKeys SrvXkbFreeGeomKeys #define XkbFreeGeomKeys SrvXkbFreeGeomKeys
#define XkbFreeGeomRows SrvXkbFreeGeomRows #define XkbFreeGeomRows SrvXkbFreeGeomRows
@ -341,12 +340,6 @@ XkbDoodadPtr SrvXkbAddGeomDoodad(XkbGeometryPtr geom,
XkbSectionPtr section, XkbSectionPtr section,
Atom name); Atom name);
extern void
XkbFreeGeomDoodads(XkbDoodadPtr /* doodads */ ,
int /* nDoodads */ ,
Bool /* freeAll */
);
extern void extern void
XkbFreeGeomProperties(XkbGeometryPtr /* geom */ , XkbFreeGeomProperties(XkbGeometryPtr /* geom */ ,
int /* first */ , int /* first */ ,