alloc/galloc: Coding style cleanup
Mostly tab-to-space conversion plus a few style nits. Dropped the register keywords as I'm pretty sure modern compilers can be trusted to do the right thing.master
Dan Nicholson
parent
1ff77ecd36
commit
46faf56ded
909
src/alloc.c
909
src/alloc.c
File diff suppressed because it is too large
Load Diff
642
src/galloc.c
642
src/galloc.c
|
|
@ -33,507 +33,489 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include <X11/extensions/XKB.h>
|
||||
|
||||
static void
|
||||
_XkbFreeGeomLeafElems( Bool freeAll,
|
||||
int first,
|
||||
int count,
|
||||
unsigned short * num_inout,
|
||||
unsigned short * sz_inout,
|
||||
char ** elems,
|
||||
unsigned int elem_sz)
|
||||
_XkbFreeGeomLeafElems(Bool freeAll, int first, int count,
|
||||
unsigned short *num_inout, unsigned short *sz_inout,
|
||||
char **elems, unsigned int elem_sz)
|
||||
{
|
||||
if ((freeAll)||(*elems==NULL)) {
|
||||
*num_inout= *sz_inout= 0;
|
||||
if (*elems!=NULL) {
|
||||
_XkbFree(*elems);
|
||||
*elems= NULL;
|
||||
}
|
||||
return;
|
||||
if (freeAll || !(*elems)) {
|
||||
*num_inout = *sz_inout = 0;
|
||||
if (*elems) {
|
||||
_XkbFree(*elems);
|
||||
*elems = NULL;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if ((first>=(*num_inout))||(first<0)||(count<1))
|
||||
return;
|
||||
if ((first >= (*num_inout)) || (first < 0) || (count < 1))
|
||||
return;
|
||||
|
||||
if (first+count>=(*num_inout)) {
|
||||
/* truncating the array is easy */
|
||||
(*num_inout)= first;
|
||||
}
|
||||
if (first + count >= (*num_inout))
|
||||
/* truncating the array is easy */
|
||||
(*num_inout) = first;
|
||||
else {
|
||||
char * ptr;
|
||||
int extra;
|
||||
ptr= *elems;
|
||||
extra= ((*num_inout)-(first+count))*elem_sz;
|
||||
if (extra>0)
|
||||
memmove(&ptr[first*elem_sz],&ptr[(first+count)*elem_sz],extra);
|
||||
(*num_inout)-= count;
|
||||
char *ptr = *elems;
|
||||
int extra = ((*num_inout) - first + count) * elem_sz;
|
||||
|
||||
if (extra > 0)
|
||||
memmove(&ptr[first * elem_sz], &ptr[(first + count) * elem_sz],
|
||||
extra);
|
||||
|
||||
(*num_inout) -= count;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
typedef void (*ContentsClearFunc)(
|
||||
char * /* priv */
|
||||
);
|
||||
typedef void (*ContentsClearFunc)(char *priv);
|
||||
|
||||
static void
|
||||
_XkbFreeGeomNonLeafElems( Bool freeAll,
|
||||
int first,
|
||||
int count,
|
||||
unsigned short * num_inout,
|
||||
unsigned short * sz_inout,
|
||||
char ** elems,
|
||||
unsigned int elem_sz,
|
||||
ContentsClearFunc freeFunc)
|
||||
_XkbFreeGeomNonLeafElems(Bool freeAll, int first, int count,
|
||||
unsigned short *num_inout, unsigned short *sz_inout,
|
||||
char **elems, unsigned int elem_sz,
|
||||
ContentsClearFunc freeFunc)
|
||||
{
|
||||
register int i;
|
||||
register char *ptr;
|
||||
int i;
|
||||
char *ptr;
|
||||
|
||||
if (freeAll) {
|
||||
first= 0;
|
||||
count= (*num_inout);
|
||||
first = 0;
|
||||
count = *num_inout;
|
||||
}
|
||||
else if ((first>=(*num_inout))||(first<0)||(count<1))
|
||||
return;
|
||||
else if (first+count>(*num_inout))
|
||||
count= (*num_inout)-first;
|
||||
if (*elems==NULL)
|
||||
return;
|
||||
else if ((first >= (*num_inout)) || (first < 0) || (count < 1))
|
||||
return;
|
||||
else if (first + count > (*num_inout))
|
||||
count = (*num_inout) - first;
|
||||
|
||||
if (!(*elems))
|
||||
return;
|
||||
|
||||
if (freeFunc) {
|
||||
ptr= *elems;
|
||||
ptr+= first*elem_sz;
|
||||
for (i=0;i<count;i++) {
|
||||
(*freeFunc)(ptr);
|
||||
ptr+= elem_sz;
|
||||
}
|
||||
ptr = *elems;
|
||||
ptr += first * elem_sz;
|
||||
for (i = 0; i < count; i++) {
|
||||
(*freeFunc)(ptr);
|
||||
ptr += elem_sz;
|
||||
}
|
||||
}
|
||||
|
||||
if (freeAll) {
|
||||
(*num_inout)= (*sz_inout)= 0;
|
||||
if (*elems) {
|
||||
_XkbFree(*elems);
|
||||
*elems= NULL;
|
||||
}
|
||||
*num_inout = *sz_inout = 0;
|
||||
if (*elems) {
|
||||
_XkbFree(*elems);
|
||||
*elems = NULL;
|
||||
}
|
||||
}
|
||||
else if (first+count>=(*num_inout))
|
||||
*num_inout= first;
|
||||
else if (first + count >= (*num_inout))
|
||||
*num_inout = first;
|
||||
else {
|
||||
i= ((*num_inout)-(first+count))*elem_sz;
|
||||
ptr= *elems;
|
||||
memmove(&ptr[first*elem_sz],&ptr[(first+count)*elem_sz],i);
|
||||
(*num_inout)-= count;
|
||||
i = ((*num_inout) - first + count) * elem_sz;
|
||||
ptr = *elems;
|
||||
memmove(&ptr[first * elem_sz], &ptr[(first + count) * elem_sz], i);
|
||||
(*num_inout) -= count;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
static void
|
||||
_XkbClearProperty(char *prop_in)
|
||||
{
|
||||
XkbPropertyPtr prop= (XkbPropertyPtr)prop_in;
|
||||
XkbPropertyPtr prop = (XkbPropertyPtr)prop_in;
|
||||
|
||||
if (prop->name) {
|
||||
_XkbFree(prop->name);
|
||||
prop->name= NULL;
|
||||
_XkbFree(prop->name);
|
||||
prop->name = NULL;
|
||||
}
|
||||
if (prop->value) {
|
||||
_XkbFree(prop->value);
|
||||
prop->value= NULL;
|
||||
_XkbFree(prop->value);
|
||||
prop->value = NULL;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomProperties( XkbGeometryPtr geom,
|
||||
int first,
|
||||
int count,
|
||||
Bool freeAll)
|
||||
XkbcFreeGeomProperties(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomNonLeafElems(freeAll,first,count,
|
||||
&geom->num_properties,&geom->sz_properties,
|
||||
(char **)&geom->properties,
|
||||
sizeof(XkbPropertyRec),_XkbClearProperty);
|
||||
return;
|
||||
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
||||
&geom->num_properties, &geom->sz_properties,
|
||||
(char **)&geom->properties,
|
||||
sizeof(XkbPropertyRec),
|
||||
_XkbClearProperty);
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomKeyAliases( XkbGeometryPtr geom,
|
||||
int first,
|
||||
int count,
|
||||
Bool freeAll)
|
||||
XkbcFreeGeomKeyAliases(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomLeafElems(freeAll,first,count,
|
||||
&geom->num_key_aliases,&geom->sz_key_aliases,
|
||||
(char **)&geom->key_aliases,
|
||||
sizeof(XkbKeyAliasRec));
|
||||
return;
|
||||
_XkbFreeGeomLeafElems(freeAll, first, count,
|
||||
&geom->num_key_aliases, &geom->sz_key_aliases,
|
||||
(char **)&geom->key_aliases,
|
||||
sizeof(XkbKeyAliasRec));
|
||||
}
|
||||
|
||||
static void
|
||||
_XkbClearColor(char *color_in)
|
||||
{
|
||||
XkbColorPtr color= (XkbColorPtr)color_in;
|
||||
XkbColorPtr color = (XkbColorPtr)color_in;
|
||||
|
||||
if (color->spec)
|
||||
_XkbFree(color->spec);
|
||||
return;
|
||||
_XkbFree(color->spec);
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomColors(XkbGeometryPtr geom,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomColors(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomNonLeafElems(freeAll,first,count,
|
||||
&geom->num_colors,&geom->sz_colors,
|
||||
(char **)&geom->colors,
|
||||
sizeof(XkbColorRec),_XkbClearColor);
|
||||
return;
|
||||
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
||||
&geom->num_colors, &geom->sz_colors,
|
||||
(char **)&geom->colors, sizeof(XkbColorRec),
|
||||
_XkbClearColor);
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomPoints(XkbOutlinePtr outline,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomPoints(XkbOutlinePtr outline, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomLeafElems(freeAll,first,count,
|
||||
&outline->num_points,&outline->sz_points,
|
||||
(char **)&outline->points,
|
||||
sizeof(XkbPointRec));
|
||||
return;
|
||||
_XkbFreeGeomLeafElems(freeAll, first, count,
|
||||
&outline->num_points, &outline->sz_points,
|
||||
(char **)&outline->points, sizeof(XkbPointRec));
|
||||
}
|
||||
|
||||
static void
|
||||
_XkbClearOutline(char *outline_in)
|
||||
{
|
||||
XkbOutlinePtr outline= (XkbOutlinePtr)outline_in;
|
||||
XkbOutlinePtr outline = (XkbOutlinePtr)outline_in;
|
||||
|
||||
if (outline->points!=NULL)
|
||||
XkbcFreeGeomPoints(outline,0,outline->num_points,True);
|
||||
return;
|
||||
if (outline->points)
|
||||
XkbcFreeGeomPoints(outline, 0, outline->num_points, True);
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomOutlines(XkbShapePtr shape,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomOutlines(XkbShapePtr shape, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomNonLeafElems(freeAll,first,count,
|
||||
&shape->num_outlines,&shape->sz_outlines,
|
||||
(char **)&shape->outlines,
|
||||
sizeof(XkbOutlineRec),_XkbClearOutline);
|
||||
|
||||
return;
|
||||
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
||||
&shape->num_outlines, &shape->sz_outlines,
|
||||
(char **)&shape->outlines, sizeof(XkbOutlineRec),
|
||||
_XkbClearOutline);
|
||||
}
|
||||
|
||||
static void
|
||||
_XkbClearShape(char *shape_in)
|
||||
{
|
||||
XkbShapePtr shape= (XkbShapePtr)shape_in;
|
||||
XkbShapePtr shape = (XkbShapePtr)shape_in;
|
||||
|
||||
if (shape->outlines)
|
||||
XkbcFreeGeomOutlines(shape,0,shape->num_outlines,True);
|
||||
return;
|
||||
XkbcFreeGeomOutlines(shape, 0, shape->num_outlines, True);
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomShapes(XkbGeometryPtr geom,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomShapes(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomNonLeafElems(freeAll,first,count,
|
||||
&geom->num_shapes,&geom->sz_shapes,
|
||||
(char **)&geom->shapes,
|
||||
sizeof(XkbShapeRec),_XkbClearShape);
|
||||
return;
|
||||
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
||||
&geom->num_shapes, &geom->sz_shapes,
|
||||
(char **)&geom->shapes, sizeof(XkbShapeRec),
|
||||
_XkbClearShape);
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomOverlayKeys(XkbOverlayRowPtr row,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomOverlayKeys(XkbOverlayRowPtr row, int first, int count,
|
||||
Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomLeafElems(freeAll,first,count,
|
||||
&row->num_keys,&row->sz_keys,
|
||||
(char **)&row->keys,
|
||||
sizeof(XkbOverlayKeyRec));
|
||||
return;
|
||||
_XkbFreeGeomLeafElems(freeAll, first, count,
|
||||
&row->num_keys, &row->sz_keys,
|
||||
(char **)&row->keys, sizeof(XkbOverlayKeyRec));
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_XkbClearOverlayRow(char *row_in)
|
||||
{
|
||||
XkbOverlayRowPtr row= (XkbOverlayRowPtr)row_in;
|
||||
XkbOverlayRowPtr row = (XkbOverlayRowPtr)row_in;
|
||||
|
||||
if (row->keys!=NULL)
|
||||
XkbcFreeGeomOverlayKeys(row,0,row->num_keys,True);
|
||||
return;
|
||||
if (row->keys)
|
||||
XkbcFreeGeomOverlayKeys(row, 0, row->num_keys, True);
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomOverlayRows(XkbOverlayPtr overlay,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomOverlayRows(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;
|
||||
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
||||
&overlay->num_rows, &overlay->sz_rows,
|
||||
(char **)&overlay->rows,
|
||||
sizeof(XkbOverlayRowRec),
|
||||
_XkbClearOverlayRow);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_XkbClearOverlay(char *overlay_in)
|
||||
{
|
||||
XkbOverlayPtr overlay= (XkbOverlayPtr)overlay_in;
|
||||
XkbOverlayPtr overlay = (XkbOverlayPtr)overlay_in;
|
||||
|
||||
if (overlay->rows!=NULL)
|
||||
XkbcFreeGeomOverlayRows(overlay,0,overlay->num_rows,True);
|
||||
return;
|
||||
if (overlay->rows)
|
||||
XkbcFreeGeomOverlayRows(overlay, 0, overlay->num_rows, True);
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomOverlays(XkbSectionPtr section,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomOverlays(XkbSectionPtr section, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomNonLeafElems(freeAll,first,count,
|
||||
§ion->num_overlays,§ion->sz_overlays,
|
||||
(char **)§ion->overlays,
|
||||
sizeof(XkbOverlayRec),_XkbClearOverlay);
|
||||
return;
|
||||
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
||||
§ion->num_overlays, §ion->sz_overlays,
|
||||
(char **)§ion->overlays,
|
||||
sizeof(XkbOverlayRec),
|
||||
_XkbClearOverlay);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
XkbcFreeGeomKeys(XkbRowPtr row,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomKeys(XkbRowPtr row, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomLeafElems(freeAll,first,count,
|
||||
&row->num_keys,&row->sz_keys,
|
||||
(char **)&row->keys,
|
||||
sizeof(XkbKeyRec));
|
||||
return;
|
||||
_XkbFreeGeomLeafElems(freeAll, first, count,
|
||||
&row->num_keys, &row->sz_keys,
|
||||
(char **)&row->keys, sizeof(XkbKeyRec));
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_XkbClearRow(char *row_in)
|
||||
{
|
||||
XkbRowPtr row= (XkbRowPtr)row_in;
|
||||
XkbRowPtr row = (XkbRowPtr)row_in;
|
||||
|
||||
if (row->keys!=NULL)
|
||||
XkbcFreeGeomKeys(row,0,row->num_keys,True);
|
||||
return;
|
||||
if (row->keys)
|
||||
XkbcFreeGeomKeys(row, 0, row->num_keys, True);
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomRows(XkbSectionPtr section,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomRows(XkbSectionPtr section, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomNonLeafElems(freeAll,first,count,
|
||||
§ion->num_rows,§ion->sz_rows,
|
||||
(char **)§ion->rows,
|
||||
sizeof(XkbRowRec),_XkbClearRow);
|
||||
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
||||
§ion->num_rows, §ion->sz_rows,
|
||||
(char **)§ion->rows, sizeof(XkbRowRec),
|
||||
_XkbClearRow);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_XkbClearSection(char *section_in)
|
||||
{
|
||||
XkbSectionPtr section= (XkbSectionPtr)section_in;
|
||||
XkbSectionPtr section = (XkbSectionPtr)section_in;
|
||||
|
||||
if (section->rows!=NULL)
|
||||
XkbcFreeGeomRows(section,0,section->num_rows,True);
|
||||
if (section->doodads!=NULL) {
|
||||
XkbcFreeGeomDoodads(section->doodads,section->num_doodads,True);
|
||||
section->doodads= NULL;
|
||||
if (section->rows)
|
||||
XkbcFreeGeomRows(section, 0, section->num_rows, True);
|
||||
if (section->doodads) {
|
||||
XkbcFreeGeomDoodads(section->doodads, section->num_doodads, True);
|
||||
section->doodads = NULL;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomSections(XkbGeometryPtr geom,int first,int count,Bool freeAll)
|
||||
XkbcFreeGeomSections(XkbGeometryPtr geom, int first, int count, Bool freeAll)
|
||||
{
|
||||
_XkbFreeGeomNonLeafElems(freeAll,first,count,
|
||||
&geom->num_sections,&geom->sz_sections,
|
||||
(char **)&geom->sections,
|
||||
sizeof(XkbSectionRec),_XkbClearSection);
|
||||
return;
|
||||
_XkbFreeGeomNonLeafElems(freeAll, first, count,
|
||||
&geom->num_sections, &geom->sz_sections,
|
||||
(char **)&geom->sections, sizeof(XkbSectionRec),
|
||||
_XkbClearSection);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_XkbClearDoodad(char *doodad_in)
|
||||
{
|
||||
XkbDoodadPtr doodad= (XkbDoodadPtr)doodad_in;
|
||||
XkbDoodadPtr doodad = (XkbDoodadPtr)doodad_in;
|
||||
|
||||
switch (doodad->any.type) {
|
||||
case XkbTextDoodad:
|
||||
{
|
||||
if (doodad->text.text!=NULL) {
|
||||
_XkbFree(doodad->text.text);
|
||||
doodad->text.text= NULL;
|
||||
}
|
||||
if (doodad->text.font!=NULL) {
|
||||
_XkbFree(doodad->text.font);
|
||||
doodad->text.font= NULL;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case XkbLogoDoodad:
|
||||
{
|
||||
if (doodad->logo.logo_name!=NULL) {
|
||||
_XkbFree(doodad->logo.logo_name);
|
||||
doodad->logo.logo_name= NULL;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case XkbTextDoodad:
|
||||
if (doodad->text.text) {
|
||||
_XkbFree(doodad->text.text);
|
||||
doodad->text.text = NULL;
|
||||
}
|
||||
if (doodad->text.font) {
|
||||
_XkbFree(doodad->text.font);
|
||||
doodad->text.font = NULL;
|
||||
}
|
||||
break;
|
||||
|
||||
case XkbLogoDoodad:
|
||||
if (doodad->logo.logo_name) {
|
||||
_XkbFree(doodad->logo.logo_name);
|
||||
doodad->logo.logo_name = NULL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeomDoodads(XkbDoodadPtr doodads,int nDoodads,Bool freeAll)
|
||||
XkbcFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll)
|
||||
{
|
||||
register int i;
|
||||
register XkbDoodadPtr doodad;
|
||||
int i;
|
||||
XkbDoodadPtr doodad;
|
||||
|
||||
if (doodads) {
|
||||
for (i=0,doodad= doodads;i<nDoodads;i++,doodad++) {
|
||||
_XkbClearDoodad((char *)doodad);
|
||||
}
|
||||
if (freeAll)
|
||||
_XkbFree(doodads);
|
||||
for (i = 0, doodad = doodads; i < nDoodads; i++, doodad++)
|
||||
_XkbClearDoodad((char *)doodad);
|
||||
if (freeAll)
|
||||
_XkbFree(doodads);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
XkbcFreeGeometry(XkbGeometryPtr geom,unsigned which,Bool freeMap)
|
||||
XkbcFreeGeometry(XkbGeometryPtr geom, unsigned which, Bool freeMap)
|
||||
{
|
||||
if (geom==NULL)
|
||||
return;
|
||||
if (!geom)
|
||||
return;
|
||||
|
||||
if (freeMap)
|
||||
which= XkbGeomAllMask;
|
||||
if ((which&XkbGeomPropertiesMask)&&(geom->properties!=NULL))
|
||||
XkbcFreeGeomProperties(geom,0,geom->num_properties,True);
|
||||
if ((which&XkbGeomColorsMask)&&(geom->colors!=NULL))
|
||||
XkbcFreeGeomColors(geom,0,geom->num_colors,True);
|
||||
if ((which&XkbGeomShapesMask)&&(geom->shapes!=NULL))
|
||||
XkbcFreeGeomShapes(geom,0,geom->num_shapes,True);
|
||||
if ((which&XkbGeomSectionsMask)&&(geom->sections!=NULL))
|
||||
XkbcFreeGeomSections(geom,0,geom->num_sections,True);
|
||||
if ((which&XkbGeomDoodadsMask)&&(geom->doodads!= NULL)) {
|
||||
XkbcFreeGeomDoodads(geom->doodads,geom->num_doodads,True);
|
||||
geom->doodads= NULL;
|
||||
geom->num_doodads= geom->sz_doodads= 0;
|
||||
which = XkbGeomAllMask;
|
||||
|
||||
if ((which & XkbGeomPropertiesMask) && geom->properties)
|
||||
XkbcFreeGeomProperties(geom, 0, geom->num_properties, True);
|
||||
|
||||
if ((which & XkbGeomColorsMask) && geom->colors)
|
||||
XkbcFreeGeomColors(geom, 0, geom->num_colors, True);
|
||||
|
||||
if ((which & XkbGeomShapesMask) && geom->shapes)
|
||||
XkbcFreeGeomShapes(geom, 0, geom->num_shapes, True);
|
||||
|
||||
if ((which & XkbGeomSectionsMask) && geom->sections)
|
||||
XkbcFreeGeomSections(geom, 0, geom->num_sections, True);
|
||||
|
||||
if ((which & XkbGeomDoodadsMask) && geom->doodads) {
|
||||
XkbcFreeGeomDoodads(geom->doodads, geom->num_doodads, True);
|
||||
geom->doodads = NULL;
|
||||
geom->num_doodads = geom->sz_doodads = 0;
|
||||
}
|
||||
if ((which&XkbGeomKeyAliasesMask)&&(geom->key_aliases!=NULL))
|
||||
XkbcFreeGeomKeyAliases(geom,0,geom->num_key_aliases,True);
|
||||
|
||||
if ((which & XkbGeomKeyAliasesMask) && geom->key_aliases)
|
||||
XkbcFreeGeomKeyAliases(geom, 0, geom->num_key_aliases, True);
|
||||
|
||||
if (freeMap) {
|
||||
if (geom->label_font!=NULL) {
|
||||
_XkbFree(geom->label_font);
|
||||
geom->label_font= NULL;
|
||||
}
|
||||
_XkbFree(geom);
|
||||
if (geom->label_font) {
|
||||
_XkbFree(geom->label_font);
|
||||
geom->label_font = NULL;
|
||||
}
|
||||
_XkbFree(geom);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
static int
|
||||
_XkbGeomAlloc( char ** old,
|
||||
unsigned short * num,
|
||||
unsigned short * total,
|
||||
int num_new,
|
||||
size_t sz_elem)
|
||||
_XkbGeomAlloc(char **old, unsigned short *num, unsigned short *total,
|
||||
int num_new, size_t sz_elem)
|
||||
{
|
||||
if (num_new<1)
|
||||
return Success;
|
||||
if ((*old)==NULL)
|
||||
*num= *total= 0;
|
||||
if (num_new < 1)
|
||||
return Success;
|
||||
|
||||
if ((*num)+num_new<=(*total))
|
||||
return Success;
|
||||
if (!(*old))
|
||||
*num = *total = 0;
|
||||
|
||||
*total= (*num)+num_new;
|
||||
if ((*old)!=NULL)
|
||||
(*old)= (char *)_XkbRealloc((*old),(*total)*sz_elem);
|
||||
else (*old)= (char *)_XkbCalloc((*total),sz_elem);
|
||||
if ((*old)==NULL) {
|
||||
*total= *num= 0;
|
||||
return BadAlloc;
|
||||
if ((*num) + num_new <= (*total))
|
||||
return Success;
|
||||
|
||||
*total = (*num) + num_new;
|
||||
|
||||
if (*old)
|
||||
*old = (char *)_XkbRealloc(*old, (*total) * sz_elem);
|
||||
else
|
||||
*old = (char *)_XkbCalloc(*total, sz_elem);
|
||||
if (!(*old)) {
|
||||
*total = *num = 0;
|
||||
return BadAlloc;
|
||||
}
|
||||
|
||||
if (*num>0) {
|
||||
char *tmp= (char *)(*old);
|
||||
bzero(&tmp[sz_elem*(*num)],(num_new*sz_elem));
|
||||
if (*num > 0) {
|
||||
char *tmp = *old;
|
||||
bzero(&tmp[sz_elem * (*num)], num_new * sz_elem);
|
||||
}
|
||||
|
||||
return Success;
|
||||
}
|
||||
|
||||
#define _XkbAllocProps(g,n) _XkbGeomAlloc((char **)&(g)->properties,\
|
||||
&(g)->num_properties,&(g)->sz_properties,\
|
||||
(n),sizeof(XkbPropertyRec))
|
||||
#define _XkbAllocColors(g,n) _XkbGeomAlloc((char **)&(g)->colors,\
|
||||
&(g)->num_colors,&(g)->sz_colors,\
|
||||
(n),sizeof(XkbColorRec))
|
||||
#define _XkbAllocShapes(g,n) _XkbGeomAlloc((char **)&(g)->shapes,\
|
||||
&(g)->num_shapes,&(g)->sz_shapes,\
|
||||
(n),sizeof(XkbShapeRec))
|
||||
#define _XkbAllocSections(g,n) _XkbGeomAlloc((char **)&(g)->sections,\
|
||||
&(g)->num_sections,&(g)->sz_sections,\
|
||||
(n),sizeof(XkbSectionRec))
|
||||
#define _XkbAllocDoodads(g,n) _XkbGeomAlloc((char **)&(g)->doodads,\
|
||||
&(g)->num_doodads,&(g)->sz_doodads,\
|
||||
(n),sizeof(XkbDoodadRec))
|
||||
#define _XkbAllocKeyAliases(g,n) _XkbGeomAlloc((char **)&(g)->key_aliases,\
|
||||
&(g)->num_key_aliases,&(g)->sz_key_aliases,\
|
||||
(n),sizeof(XkbKeyAliasRec))
|
||||
#define _XkbAllocProps(g, n) _XkbGeomAlloc((char **)&(g)->properties, \
|
||||
&(g)->num_properties, \
|
||||
&(g)->sz_properties, \
|
||||
(n), sizeof(XkbPropertyRec))
|
||||
#define _XkbAllocColors(g, n) _XkbGeomAlloc((char **)&(g)->colors, \
|
||||
&(g)->num_colors, \
|
||||
&(g)->sz_colors, \
|
||||
(n), sizeof(XkbColorRec))
|
||||
#define _XkbAllocShapes(g, n) _XkbGeomAlloc((char **)&(g)->shapes, \
|
||||
&(g)->num_shapes, \
|
||||
&(g)->sz_shapes, \
|
||||
(n), sizeof(XkbShapeRec))
|
||||
#define _XkbAllocSections(g, n) _XkbGeomAlloc((char **)&(g)->sections, \
|
||||
&(g)->num_sections, \
|
||||
&(g)->sz_sections, \
|
||||
(n), sizeof(XkbSectionRec))
|
||||
#define _XkbAllocDoodads(g, n) _XkbGeomAlloc((char **)&(g)->doodads, \
|
||||
&(g)->num_doodads, \
|
||||
&(g)->sz_doodads, \
|
||||
(n), sizeof(XkbDoodadRec))
|
||||
#define _XkbAllocKeyAliases(g, n) _XkbGeomAlloc((char **)&(g)->key_aliases, \
|
||||
&(g)->num_key_aliases, \
|
||||
&(g)->sz_key_aliases, \
|
||||
(n), sizeof(XkbKeyAliasRec))
|
||||
|
||||
#define _XkbAllocOutlines(s,n) _XkbGeomAlloc((char **)&(s)->outlines,\
|
||||
&(s)->num_outlines,&(s)->sz_outlines,\
|
||||
(n),sizeof(XkbOutlineRec))
|
||||
#define _XkbAllocRows(s,n) _XkbGeomAlloc((char **)&(s)->rows,\
|
||||
&(s)->num_rows,&(s)->sz_rows,\
|
||||
(n),sizeof(XkbRowRec))
|
||||
#define _XkbAllocPoints(o,n) _XkbGeomAlloc((char **)&(o)->points,\
|
||||
&(o)->num_points,&(o)->sz_points,\
|
||||
(n),sizeof(XkbPointRec))
|
||||
#define _XkbAllocKeys(r,n) _XkbGeomAlloc((char **)&(r)->keys,\
|
||||
&(r)->num_keys,&(r)->sz_keys,\
|
||||
(n),sizeof(XkbKeyRec))
|
||||
#define _XkbAllocOverlays(s,n) _XkbGeomAlloc((char **)&(s)->overlays,\
|
||||
&(s)->num_overlays,&(s)->sz_overlays,\
|
||||
(n),sizeof(XkbOverlayRec))
|
||||
#define _XkbAllocOverlayRows(o,n) _XkbGeomAlloc((char **)&(o)->rows,\
|
||||
&(o)->num_rows,&(o)->sz_rows,\
|
||||
(n),sizeof(XkbOverlayRowRec))
|
||||
#define _XkbAllocOverlayKeys(r,n) _XkbGeomAlloc((char **)&(r)->keys,\
|
||||
&(r)->num_keys,&(r)->sz_keys,\
|
||||
(n),sizeof(XkbOverlayKeyRec))
|
||||
#define _XkbAllocOutlines(s, n) _XkbGeomAlloc((char **)&(s)->outlines, \
|
||||
&(s)->num_outlines, \
|
||||
&(s)->sz_outlines, \
|
||||
(n), sizeof(XkbOutlineRec))
|
||||
#define _XkbAllocRows(s, n) _XkbGeomAlloc((char **)&(s)->rows, \
|
||||
&(s)->num_rows, \
|
||||
&(s)->sz_rows, \
|
||||
(n), sizeof(XkbRowRec))
|
||||
#define _XkbAllocPoints(o, n) _XkbGeomAlloc((char **)&(o)->points, \
|
||||
&(o)->num_points, \
|
||||
&(o)->sz_points, \
|
||||
(n), sizeof(XkbPointRec))
|
||||
#define _XkbAllocKeys(r, n) _XkbGeomAlloc((char **)&(r)->keys, \
|
||||
&(r)->num_keys, \
|
||||
&(r)->sz_keys, \
|
||||
(n), sizeof(XkbKeyRec))
|
||||
#define _XkbAllocOverlays(s, n) _XkbGeomAlloc((char **)&(s)->overlays, \
|
||||
&(s)->num_overlays, \
|
||||
&(s)->sz_overlays, \
|
||||
(n), sizeof(XkbOverlayRec))
|
||||
#define _XkbAllocOverlayRows(o, n) _XkbGeomAlloc((char **)&(o)->rows, \
|
||||
&(o)->num_rows, \
|
||||
&(o)->sz_rows, \
|
||||
(n), sizeof(XkbOverlayRowRec))
|
||||
#define _XkbAllocOverlayKeys(r, n) _XkbGeomAlloc((char **)&(r)->keys, \
|
||||
&(r)->num_keys, \
|
||||
&(r)->sz_keys, \
|
||||
(n), sizeof(XkbOverlayKeyRec))
|
||||
|
||||
int
|
||||
XkbcAllocGeometry(XkbcDescPtr xkb,XkbGeometrySizesPtr sizes)
|
||||
XkbcAllocGeometry(XkbcDescPtr xkb, XkbGeometrySizesPtr sizes)
|
||||
{
|
||||
XkbGeometryPtr geom;
|
||||
int rtrn;
|
||||
XkbGeometryPtr geom;
|
||||
int rtrn;
|
||||
|
||||
if (xkb->geom==NULL) {
|
||||
xkb->geom= _XkbTypedCalloc(1,XkbGeometryRec);
|
||||
if (!xkb->geom)
|
||||
return BadAlloc;
|
||||
}
|
||||
geom= xkb->geom;
|
||||
if ((sizes->which&XkbGeomPropertiesMask)&&
|
||||
((rtrn=_XkbAllocProps(geom,sizes->num_properties))!=Success)) {
|
||||
goto BAIL;
|
||||
}
|
||||
if ((sizes->which&XkbGeomColorsMask)&&
|
||||
((rtrn=_XkbAllocColors(geom,sizes->num_colors))!=Success)) {
|
||||
goto BAIL;
|
||||
}
|
||||
if ((sizes->which&XkbGeomShapesMask)&&
|
||||
((rtrn=_XkbAllocShapes(geom,sizes->num_shapes))!=Success)) {
|
||||
goto BAIL;
|
||||
}
|
||||
if ((sizes->which&XkbGeomSectionsMask)&&
|
||||
((rtrn=_XkbAllocSections(geom,sizes->num_sections))!=Success)) {
|
||||
goto BAIL;
|
||||
}
|
||||
if ((sizes->which&XkbGeomDoodadsMask)&&
|
||||
((rtrn=_XkbAllocDoodads(geom,sizes->num_doodads))!=Success)) {
|
||||
goto BAIL;
|
||||
}
|
||||
if ((sizes->which&XkbGeomKeyAliasesMask)&&
|
||||
((rtrn=_XkbAllocKeyAliases(geom,sizes->num_key_aliases))!=Success)) {
|
||||
goto BAIL;
|
||||
if (!xkb->geom) {
|
||||
xkb->geom = _XkbTypedCalloc(1, XkbGeometryRec);
|
||||
if (!xkb->geom)
|
||||
return BadAlloc;
|
||||
}
|
||||
geom = xkb->geom;
|
||||
|
||||
if ((sizes->which & XkbGeomPropertiesMask) &&
|
||||
((rtrn = _XkbAllocProps(geom, sizes->num_properties)) != Success))
|
||||
goto bail;
|
||||
|
||||
if ((sizes->which & XkbGeomColorsMask) &&
|
||||
((rtrn = _XkbAllocColors(geom, sizes->num_colors)) != Success))
|
||||
goto bail;
|
||||
|
||||
if ((sizes->which & XkbGeomShapesMask) &&
|
||||
((rtrn = _XkbAllocShapes(geom, sizes->num_shapes)) != Success))
|
||||
goto bail;
|
||||
|
||||
if ((sizes->which & XkbGeomSectionsMask) &&
|
||||
((rtrn = _XkbAllocSections(geom, sizes->num_sections)) != Success))
|
||||
goto bail;
|
||||
|
||||
if ((sizes->which & XkbGeomDoodadsMask) &&
|
||||
((rtrn = _XkbAllocDoodads(geom, sizes->num_doodads)) != Success))
|
||||
goto bail;
|
||||
|
||||
if ((sizes->which & XkbGeomKeyAliasesMask) &&
|
||||
((rtrn = _XkbAllocKeyAliases(geom, sizes->num_key_aliases)) != Success))
|
||||
goto bail;
|
||||
|
||||
return Success;
|
||||
BAIL:
|
||||
XkbcFreeGeometry(geom,XkbGeomAllMask,True);
|
||||
xkb->geom= NULL;
|
||||
bail:
|
||||
XkbcFreeGeometry(geom, XkbGeomAllMask, True);
|
||||
xkb->geom = NULL;
|
||||
return rtrn;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue