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

XKB: Geom: Remove unused code 

These codepaths were never called by anyone.  Shame there weren't more
of them.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Daniel Stone 2012-07-10 02:03:31 +01:00 committed by Keith Packard
parent e191e296e6
commit 06e4ba8b26
2 changed files with 0 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
xkb/XKBGAlloc.c
View File

@ -249,51 +249,6 @@ XkbFreeGeomOverlayKeys(XkbOverlayRowPtr row, int first, int count, Bool freeAll)
/***====================================================================***/ /***====================================================================***/
static void
_XkbClearOverlayRow(char *row_in)
{
XkbOverlayRowPtr row = (XkbOverlayRowPtr) row_in;
if (row->keys != NULL)
XkbFreeGeomOverlayKeys(row, 0, row->num_keys, TRUE);
return;
}
void
XkbFreeGeomOverlayRows(XkbOverlayPtr overlay, int first, int count,
Bool freeAll)
{
_XkbFreeGeomNonLeafElems(freeAll, first, count,
&overlay->num_rows, &overlay->sz_rows,
(char **) &overlay->rows,
sizeof(XkbOverlayRowRec), _XkbClearOverlayRow);
return;
}
/***====================================================================***/
static void
_XkbClearOverlay(char *overlay_in)
{
XkbOverlayPtr overlay = (XkbOverlayPtr) overlay_in;
if (overlay->rows != NULL)
XkbFreeGeomOverlayRows(overlay, 0, overlay->num_rows, TRUE);
return;
}
void
XkbFreeGeomOverlays(XkbSectionPtr section, int first, int count, Bool freeAll)
{
_XkbFreeGeomNonLeafElems(freeAll, first, count,
&section->num_overlays, &section->sz_overlays,
(char **) &section->overlays,
sizeof(XkbOverlayRec), _XkbClearOverlay);
return;
}
/***====================================================================***/
void void
XkbFreeGeomKeys(XkbRowPtr row, int first, int count, Bool freeAll) XkbFreeGeomKeys(XkbRowPtr row, int first, int count, Bool freeAll)
{ {
@ -542,90 +497,6 @@ _XkbGeomAlloc(void **old,
&(r)->num_keys,&(r)->sz_keys,\ &(r)->num_keys,&(r)->sz_keys,\
(n),sizeof(XkbOverlayKeyRec)) (n),sizeof(XkbOverlayKeyRec))
Status
XkbAllocGeomProps(XkbGeometryPtr geom, int nProps)
{
return _XkbAllocProps(geom, nProps);
}
Status
XkbAllocGeomColors(XkbGeometryPtr geom, int nColors)
{
return _XkbAllocColors(geom, nColors);
}
Status
XkbAllocGeomKeyAliases(XkbGeometryPtr geom, int nKeyAliases)
{
return _XkbAllocKeyAliases(geom, nKeyAliases);
}
Status
XkbAllocGeomShapes(XkbGeometryPtr geom, int nShapes)
{
return _XkbAllocShapes(geom, nShapes);
}
Status
XkbAllocGeomSections(XkbGeometryPtr geom, int nSections)
{
return _XkbAllocSections(geom, nSections);
}
Status
XkbAllocGeomOverlays(XkbSectionPtr section, int nOverlays)
{
return _XkbAllocOverlays(section, nOverlays);
}
Status
XkbAllocGeomOverlayRows(XkbOverlayPtr overlay, int nRows)
{
return _XkbAllocOverlayRows(overlay, nRows);
}
Status
XkbAllocGeomOverlayKeys(XkbOverlayRowPtr row, int nKeys)
{
return _XkbAllocOverlayKeys(row, nKeys);
}
Status
XkbAllocGeomDoodads(XkbGeometryPtr geom, int nDoodads)
{
return _XkbAllocDoodads(geom, nDoodads);
}
Status
XkbAllocGeomSectionDoodads(XkbSectionPtr section, int nDoodads)
{
return _XkbAllocDoodads(section, nDoodads);
}
Status
XkbAllocGeomOutlines(XkbShapePtr shape, int nOL)
{
return _XkbAllocOutlines(shape, nOL);
}
Status
XkbAllocGeomRows(XkbSectionPtr section, int nRows)
{
return _XkbAllocRows(section, nRows);
}
Status
XkbAllocGeomPoints(XkbOutlinePtr ol, int nPts)
{
return _XkbAllocPoints(ol, nPts);
}
Status
XkbAllocGeomKeys(XkbRowPtr row, int nKeys)
{
return _XkbAllocKeys(row, nKeys);
}
Status Status
XkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes) XkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes)
{ {

17
xkb/xkbgeom.h
View File

@ -41,28 +41,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbAddGeomRow SrvXkbAddGeomRow #define XkbAddGeomRow SrvXkbAddGeomRow
#define XkbAddGeomSection SrvXkbAddGeomSection #define XkbAddGeomSection SrvXkbAddGeomSection
#define XkbAddGeomShape SrvXkbAddGeomShape #define XkbAddGeomShape SrvXkbAddGeomShape
#define XkbAllocGeomKeyAliases SrvXkbAllocGeomKeyAliases
#define XkbAllocGeomColors SrvXkbAllocGeomColors
#define XkbAllocGeomDoodads SrvXkbAllocGeomDoodads
#define XkbAllocGeomKeys SrvXkbAllocGeomKeys
#define XkbAllocGeomOutlines SrvXkbAllocGeomOutlines
#define XkbAllocGeomPoints SrvXkbAllocGeomPoints
#define XkbAllocGeomProps SrvXkbAllocGeomProps
#define XkbAllocGeomRows SrvXkbAllocGeomRows
#define XkbAllocGeomSectionDoodads SrvXkbAllocGeomSectionDoodads
#define XkbAllocGeomSections SrvXkbAllocGeomSections
#define XkbAllocGeomOverlays SrvXkbAllocGeomOverlays
#define XkbAllocGeomOverlayRows SrvXkbAllocGeomOverlayRows
#define XkbAllocGeomOverlayKeys SrvXkbAllocGeomOverlayKeys
#define XkbAllocGeomShapes SrvXkbAllocGeomShapes
#define XkbAllocGeometry SrvXkbAllocGeometry #define XkbAllocGeometry SrvXkbAllocGeometry
#define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases #define XkbFreeGeomKeyAliases SrvXkbFreeGeomKeyAliases
#define XkbFreeGeomColors SrvXkbFreeGeomColors #define XkbFreeGeomColors SrvXkbFreeGeomColors
#define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads #define XkbFreeGeomDoodads SrvXkbFreeGeomDoodads
#define XkbFreeGeomProperties SrvXkbFreeGeomProperties #define XkbFreeGeomProperties SrvXkbFreeGeomProperties
#define XkbFreeGeomOverlayKeys SrvXkbFreeGeomOverlayKeys
#define XkbFreeGeomOverlayRows SrvXkbFreeGeomOverlayRows
#define XkbFreeGeomOverlays SrvXkbFreeGeomOverlays
#define XkbFreeGeomKeys SrvXkbFreeGeomKeys #define XkbFreeGeomKeys SrvXkbFreeGeomKeys
#define XkbFreeGeomRows SrvXkbFreeGeomRows #define XkbFreeGeomRows SrvXkbFreeGeomRows
#define XkbFreeGeomSections SrvXkbFreeGeomSections #define XkbFreeGeomSections SrvXkbFreeGeomSections