Replace uAlloc() and uTypedAlloc() with direct malloc() calls

All these wrappers did was mess with types.

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

1 files changed, 26 insertions, 26 deletions

diff --git a/parseutils.c b/parseutils.c
index dac463a..539aff9 100644
--- a/parseutils.c
+++ b/parseutils.c
@@ -57,7 +57,7 @@ ExprDef *
 ExprCreate(unsigned op, unsigned type)
 {
     ExprDef *expr;
-    expr = uTypedAlloc(ExprDef);
+    expr = malloc(sizeof(ExprDef));
     if (expr)
     {
         *expr = (ExprDef) {
@@ -79,7 +79,7 @@ ExprDef *
 ExprCreateUnary(unsigned op, unsigned type, ExprDef * child)
 {
     ExprDef *expr;
-    expr = uTypedAlloc(ExprDef);
+    expr = malloc(sizeof(ExprDef));
     if (expr)
     {
         *expr = (ExprDef) {
@@ -102,7 +102,7 @@ ExprDef *
 ExprCreateBinary(unsigned op, ExprDef * left, ExprDef * right)
 {
     ExprDef *expr;
-    expr = uTypedAlloc(ExprDef);
+    expr = malloc(sizeof(ExprDef));
     if (expr)
     {
         *expr = (ExprDef) {
@@ -132,7 +132,7 @@ KeycodeCreate(char *name, ExprDef * value)
 {
     KeycodeDef *def;
 
-    def = uTypedAlloc(KeycodeDef);
+    def = malloc(sizeof(KeycodeDef));
     if (def)
     {
         *def = (KeycodeDef) {
@@ -156,7 +156,7 @@ KeyAliasCreate(char *alias, char *real)
 {
     KeyAliasDef *def;
 
-    def = uTypedAlloc(KeyAliasDef);
+    def = malloc(sizeof(KeyAliasDef));
     if (def)
     {
         *def = (KeyAliasDef) {
@@ -180,7 +180,7 @@ VModDef *
 VModCreate(Atom name, ExprDef * value)
 {
     VModDef *def;
-    def = uTypedAlloc(VModDef);
+    def = malloc(sizeof(VModDef));
     if (def)
     {
         *def = (VModDef) {
@@ -202,7 +202,7 @@ VarDef *
 VarCreate(ExprDef * name, ExprDef * value)
 {
     VarDef *def;
-    def = uTypedAlloc(VarDef);
+    def = malloc(sizeof(VarDef));
     if (def)
     {
         *def = (VarDef) {
@@ -237,7 +237,7 @@ InterpCreate(const char *sym_str, ExprDef * match)
 {
     InterpDef *def;
 
-    def = uTypedAlloc(InterpDef);
+    def = malloc(sizeof(InterpDef));
     if (def)
     {
         *def = (InterpDef) {
@@ -263,7 +263,7 @@ KeyTypeCreate(Atom name, VarDef * body)
 {
     KeyTypeDef *def;
 
-    def = uTypedAlloc(KeyTypeDef);
+    def = malloc(sizeof(KeyTypeDef));
     if (def)
     {
         *def = (KeyTypeDef) {
@@ -287,7 +287,7 @@ SymbolsCreate(char *keyName, ExprDef * symbols)
 {
     SymbolsDef *def;
 
-    def = uTypedAlloc(SymbolsDef);
+    def = malloc(sizeof(SymbolsDef));
     if (def)
     {
         *def = (SymbolsDef) {
@@ -312,7 +312,7 @@ GroupCompatCreate(int group, ExprDef * val)
 {
     GroupCompatDef *def;
 
-    def = uTypedAlloc(GroupCompatDef);
+    def = malloc(sizeof(GroupCompatDef));
     if (def)
     {
         *def = (GroupCompatDef) {
@@ -336,7 +336,7 @@ ModMapCreate(Atom modifier, ExprDef * keys)
 {
     ModMapDef *def;
 
-    def = uTypedAlloc(ModMapDef);
+    def = malloc(sizeof(ModMapDef));
     if (def)
     {
         *def = (ModMapDef) {
@@ -360,7 +360,7 @@ IndicatorMapCreate(Atom name, VarDef * body)
 {
     IndicatorMapDef *def;
 
-    def = uTypedAlloc(IndicatorMapDef);
+    def = malloc(sizeof(IndicatorMapDef));
     if (def)
     {
         *def = (IndicatorMapDef) {
@@ -384,7 +384,7 @@ IndicatorNameCreate(int ndx, ExprDef * name, Bool virtual)
 {
     IndicatorNameDef *def;
 
-    def = uTypedAlloc(IndicatorNameDef);
+    def = malloc(sizeof(IndicatorNameDef));
     if (def)
     {
         *def = (IndicatorNameDef) {
@@ -409,7 +409,7 @@ ActionCreate(Atom name, ExprDef * args)
 {
     ExprDef *act;
 
-    act = uTypedAlloc(ExprDef);
+    act = malloc(sizeof(ExprDef));
     if (act)
     {
         *act = (ExprDef) {
@@ -451,7 +451,7 @@ ShapeDeclCreate(Atom name, OutlineDef * outlines)
 {
     ShapeDef *shape;
 
-    shape = uTypedAlloc(ShapeDef);
+    shape = malloc(sizeof(ShapeDef));
     if (shape != NULL)
     {
         bzero(shape, sizeof(ShapeDef));
@@ -478,7 +478,7 @@ OutlineCreate(Atom field, ExprDef * points)
 {
     OutlineDef *outline;
 
-    outline = uTypedAlloc(OutlineDef);
+    outline = malloc(sizeof(OutlineDef));
     if (outline != NULL)
     {
         bzero(outline, sizeof(OutlineDef));
@@ -506,7 +506,7 @@ KeyDeclCreate(char *name, ExprDef * expr)
 {
     KeyDef *key;
 
-    key = uTypedAlloc(KeyDef);
+    key = malloc(sizeof(KeyDef));
     if (key != NULL)
     {
         bzero(key, sizeof(KeyDef));
@@ -537,7 +537,7 @@ RowDeclCreate(KeyDef * keys)
 {
     RowDef *row;
 
-    row = uTypedAlloc(RowDef);
+    row = malloc(sizeof(RowDef));
     if (row != NULL)
     {
         bzero(row, sizeof(RowDef));
@@ -561,7 +561,7 @@ SectionDeclCreate(Atom name, RowDef * rows)
 {
     SectionDef *section;
 
-    section = uTypedAlloc(SectionDef);
+    section = malloc(sizeof(SectionDef));
     if (section != NULL)
     {
         bzero(section, sizeof(SectionDef));
@@ -586,7 +586,7 @@ OverlayKeyCreate(char *under, char *over)
 {
     OverlayKeyDef *key;
 
-    key = uTypedAlloc(OverlayKeyDef);
+    key = malloc(sizeof(OverlayKeyDef));
     if (key != NULL)
     {
         bzero(key, sizeof(OverlayKeyDef));
@@ -606,7 +606,7 @@ OverlayDeclCreate(Atom name, OverlayKeyDef * keys)
 {
     OverlayDef *ol;
 
-    ol = uTypedAlloc(OverlayDef);
+    ol = malloc(sizeof(OverlayDef));
     if (ol != NULL)
     {
         bzero(ol, sizeof(OverlayDef));
@@ -629,7 +629,7 @@ DoodadCreate(unsigned type, Atom name, VarDef * body)
 {
     DoodadDef *doodad;
 
-    doodad = uTypedAlloc(DoodadDef);
+    doodad = malloc(sizeof(DoodadDef));
     if (doodad != NULL)
     {
         bzero(doodad, sizeof(DoodadDef));
@@ -723,10 +723,10 @@ IncludeCreate(char *str, unsigned merge)
                 haveSelf = True;
             }
             if (first == NULL)
-                first = incl = uTypedAlloc(IncludeStmt);
+                first = incl = malloc(sizeof(IncludeStmt));
             else
             {
-                incl->next = uTypedAlloc(IncludeStmt);
+                incl->next = malloc(sizeof(IncludeStmt));
                 incl = incl->next;
             }
             if (incl)
@@ -861,7 +861,7 @@ CreateXKBFile(int type, char *name, ParseCommon * defs, unsigned flags)
     XkbFile *file;
     static int fileID;
 
-    file = uTypedAlloc(XkbFile);
+    file = malloc(sizeof(XkbFile));
     if (file)
     {
         XkbEnsureSafeMapName(name);