Replace uFree() with direct free() calls

All these wrappers did was mess with types and add a test for
NULL pointers that isn't needed in C89 and later.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/geometry.c b/geometry.c
index 237e730..cbacba6 100644
--- a/geometry.c
+++ b/geometry.c
@@ -292,12 +292,12 @@ FreeProperties(PropertyInfo * pi, GeometryInfo * info)
     for (tmp = pi; tmp != NULL; tmp = next)
     {
         if (tmp->name)
-            uFree(tmp->name);
+            free(tmp->name);
         if (tmp->value)
-            uFree(tmp->value);
+            free(tmp->value);
         tmp->name = tmp->value = NULL;
         next = (PropertyInfo *) tmp->defs.next;
-        uFree(tmp);
+        free(tmp);
     }
     return;
 }
@@ -353,7 +353,7 @@ FreeKeys(KeyInfo * key, RowInfo * row, GeometryInfo * info)
     {
         ClearKeyInfo(tmp);
         next = (KeyInfo *) tmp->defs.next;
-        uFree(tmp);
+        free(tmp);
     }
     return;
 }
@@ -409,7 +409,7 @@ FreeRows(RowInfo * row, SectionInfo * section, GeometryInfo * info)
     {
         ClearRowInfo(tmp, info);
         next = (RowInfo *) tmp->defs.next;
-        uFree(tmp);
+        free(tmp);
     }
     return;
 }
@@ -528,7 +528,7 @@ FreeDoodads(DoodadInfo * di, SectionInfo * si, GeometryInfo * info)
     {
         next = (DoodadInfo *) tmp->defs.next;
         ClearDoodadInfo(tmp);
-        uFree(tmp);
+        free(tmp);
     }
     return;
 }
@@ -618,7 +618,7 @@ FreeSections(SectionInfo * si, GeometryInfo * info)
     {
         ClearSectionInfo(tmp, info);
         next = (SectionInfo *) tmp->defs.next;
-        uFree(tmp);
+        free(tmp);
     }
     return;
 }
@@ -643,19 +643,19 @@ FreeShapes(ShapeInfo * si, GeometryInfo * info)
             {
                 if (tmp->outlines[i].points != NULL)
                 {
-                    uFree(tmp->outlines[i].points);
+                    free(tmp->outlines[i].points);
                     tmp->outlines[i].num_points = 0;
                     tmp->outlines[i].points = NULL;
                 }
             }
-            uFree(tmp->outlines);
+            free(tmp->outlines);
             tmp->szOutlines = 0;
             tmp->nOutlines = 0;
             tmp->outlines = NULL;
             tmp->primary = tmp->approx = NULL;
         }
         next = (ShapeInfo *) tmp->defs.next;
-        uFree(tmp);
+        free(tmp);
     }
     return;
 }
@@ -677,7 +677,7 @@ static void
 ClearGeometryInfo(GeometryInfo * info)
 {
     if (info->name)
-        uFree(info->name);
+        free(info->name);
     info->name = NULL;
     if (info->props)
         FreeProperties(info->props, info);
@@ -751,7 +751,7 @@ AddProperty(GeometryInfo * info, PropertyInfo * new)
                         new->value);
             }
             if (old->value)
-                uFree(old->value);
+                free(old->value);
             old->value = uStringDup(new->value);
             return True;
         }
@@ -1353,7 +1353,7 @@ HandleIncludeGeometry(IncludeStmt * stmt, XkbDescPtr xkb, GeometryInfo * info,
         if (stmt->stmt != NULL)
         {
             if (included.name != NULL)
-                uFree(included.name);
+                free(included.name);
             included.name = stmt->stmt;
             stmt->stmt = NULL;
         }
@@ -3454,7 +3454,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom,
     while ((oi->keys != NULL) && (oi->keys->sectionRow == _GOK_UnknownRow))
     {
         next = (OverlayKeyInfo *) oi->keys->defs.next;
-        uFree(oi->keys);
+        free(oi->keys);
         oi->keys = next;
         oi->nKeys--;
     }
@@ -3465,7 +3465,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom,
         {
             ki->defs.next = next->defs.next;
             oi->nKeys--;
-            uFree(next);
+            free(next);
             next = (OverlayKeyInfo *) ki->defs.next;
         }
     }