diff options
Diffstat (limited to 'geometry.c')
| -rw-r--r-- | geometry.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -884,7 +884,7 @@ NextDfltDoodad(SectionInfo * si, GeometryInfo * info) { DoodadInfo *di; - di = uTypedCalloc(1, DoodadInfo); + di = calloc(1, sizeof(DoodadInfo)); if (!di) return NULL; if (si) @@ -907,7 +907,7 @@ NextDoodad(SectionInfo * si, GeometryInfo * info) { DoodadInfo *di; - di = uTypedCalloc(1, DoodadInfo); + di = calloc(1, sizeof(DoodadInfo)); if (di) { if (si) @@ -1048,7 +1048,7 @@ AddOverlay(SectionInfo * si, GeometryInfo * info, OverlayInfo * new) return True; } old = new; - new = uTypedCalloc(1, OverlayInfo); + new = calloc(1, sizeof(OverlayInfo)); if (!new) { if (warningLevel > 0) @@ -2404,7 +2404,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge, return True; } si->nOutlines = def->nOutlines; - si->outlines = uTypedCalloc(def->nOutlines, XkbOutlineRec); + si->outlines = calloc(def->nOutlines, sizeof(XkbOutlineRec)); if (!si->outlines) { ERROR("Couldn't allocate outlines for \"%s\"\n", @@ -2425,7 +2425,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge, outline = &si->outlines[nOut++]; outline->num_points = ol->nPoints; outline->corner_radius = si->dfltCornerRadius; - outline->points = uTypedCalloc(ol->nPoints, XkbPointRec); + outline->points = calloc(ol->nPoints, sizeof(XkbPointRec)); if (!outline->points) { ERROR("Can't allocate points for \"%s\"\n", @@ -2565,7 +2565,7 @@ HandleOverlayDef(OverlayDef * def, for (OverlayKeyDef *keyDef = def->keys; keyDef; keyDef = (OverlayKeyDef *) keyDef->common.next) { - OverlayKeyInfo *key = uTypedCalloc(1, OverlayKeyInfo); + OverlayKeyInfo *key = calloc(1, sizeof(OverlayKeyInfo)); if (!key) { if (warningLevel > 0) @@ -3292,7 +3292,7 @@ FontFromParts(Atom fontTok, totalSize = strlen(FONT_TEMPLATE) + strlen(font) + strlen(weight) + strlen(slant); totalSize += strlen(setWidth) + strlen(variant) + strlen(encoding); - rtrn = uCalloc(totalSize, 1); + rtrn = calloc(totalSize, 1); if (rtrn) { snprintf(rtrn, totalSize, FONT_TEMPLATE, font, weight, slant, |