diff options
Diffstat (limited to 'xkb/XKBGAlloc.c')
| -rw-r--r-- | xkb/XKBGAlloc.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c index b01005dd0..7a3659f54 100644 --- a/xkb/XKBGAlloc.c +++ b/xkb/XKBGAlloc.c @@ -51,7 +51,7 @@ _XkbFreeGeomLeafElems( Bool freeAll, if ((freeAll)||(*elems==NULL)) { *num_inout= *sz_inout= 0; if (*elems!=NULL) { - xfree(*elems); + free(*elems); *elems= NULL; } return; @@ -115,7 +115,7 @@ register char *ptr; if (freeAll) { (*num_inout)= (*sz_inout)= 0; if (*elems) { - xfree(*elems); + free(*elems); *elems= NULL; } } @@ -138,11 +138,11 @@ _XkbClearProperty(char *prop_in) XkbPropertyPtr prop= (XkbPropertyPtr)prop_in; if (prop->name) { - xfree(prop->name); + free(prop->name); prop->name= NULL; } if (prop->value) { - xfree(prop->value); + free(prop->value); prop->value= NULL; } return; @@ -184,7 +184,7 @@ _XkbClearColor(char *color_in) XkbColorPtr color= (XkbColorPtr)color_in; if (color->spec) - xfree(color->spec); + free(color->spec); return; } @@ -381,11 +381,11 @@ XkbDoodadPtr doodad= (XkbDoodadPtr)doodad_in; case XkbTextDoodad: { if (doodad->text.text!=NULL) { - xfree(doodad->text.text); + free(doodad->text.text); doodad->text.text= NULL; } if (doodad->text.font!=NULL) { - xfree(doodad->text.font); + free(doodad->text.font); doodad->text.font= NULL; } } @@ -393,7 +393,7 @@ XkbDoodadPtr doodad= (XkbDoodadPtr)doodad_in; case XkbLogoDoodad: { if (doodad->logo.logo_name!=NULL) { - xfree(doodad->logo.logo_name); + free(doodad->logo.logo_name); doodad->logo.logo_name= NULL; } } @@ -413,7 +413,7 @@ register XkbDoodadPtr doodad; _XkbClearDoodad((char *)doodad); } if (freeAll) - xfree(doodads); + free(doodads); } return; } @@ -442,10 +442,10 @@ XkbFreeGeometry(XkbGeometryPtr geom,unsigned which,Bool freeMap) XkbFreeGeomKeyAliases(geom,0,geom->num_key_aliases,TRUE); if (freeMap) { if (geom->label_font!=NULL) { - xfree(geom->label_font); + free(geom->label_font); geom->label_font= NULL; } - xfree(geom); + free(geom); } return; } @@ -469,8 +469,8 @@ _XkbGeomAlloc( void ** old, *total= (*num)+num_new; if ((*old)!=NULL) - (*old)= xrealloc((*old),(*total)*sz_elem); - else (*old)= xcalloc((*total),sz_elem); + (*old)= realloc((*old),(*total)*sz_elem); + else (*old)= calloc((*total),sz_elem); if ((*old)==NULL) { *total= *num= 0; return BadAlloc; @@ -615,7 +615,7 @@ XkbGeometryPtr geom; Status rtrn; if (xkb->geom==NULL) { - xkb->geom= xcalloc(1, sizeof(XkbGeometryRec)); + xkb->geom= calloc(1, sizeof(XkbGeometryRec)); if (!xkb->geom) return BadAlloc; } @@ -664,8 +664,8 @@ register XkbPropertyPtr prop; for (i=0,prop=geom->properties;i<geom->num_properties;i++,prop++) { if ((prop->name)&&(strcmp(name,prop->name)==0)) { if (prop->value) - xfree(prop->value); - prop->value= xalloc(strlen(value)+1); + free(prop->value); + prop->value= malloc(strlen(value)+1); if (prop->value) strcpy(prop->value,value); return prop; @@ -676,13 +676,13 @@ register XkbPropertyPtr prop; return NULL; } prop= &geom->properties[geom->num_properties]; - prop->name= xalloc(strlen(name)+1); + prop->name= malloc(strlen(name)+1); if (!name) return NULL; strcpy(prop->name,name); - prop->value= xalloc(strlen(value)+1); + prop->value= malloc(strlen(value)+1); if (!value) { - xfree(prop->name); + free(prop->name); prop->name= NULL; return NULL; } @@ -738,7 +738,7 @@ register XkbColorPtr color; } color= &geom->colors[geom->num_colors]; color->pixel= pixel; - color->spec= xalloc(strlen(spec)+1); + color->spec= malloc(strlen(spec)+1); if (!color->spec) return NULL; strcpy(color->spec,spec); @@ -852,7 +852,7 @@ XkbSectionPtr section; return NULL; if ((sz_doodads>0)&&(_XkbAllocDoodads(section,sz_doodads)!=Success)) { if (section->rows) { - xfree(section->rows); + free(section->rows); section->rows= NULL; section->sz_rows= section->num_rows= 0; } |