Remove memory accounting and reporting

[platform/upstream/fontconfig.git] / src / fccharset.c

diff --git a/src/fccharset.c b/src/fccharset.c
index 61489c4..df98eb2 100644 (file)
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -35,7 +35,6 @@ FcCharSetCreate (void)
     fcs = (FcCharSet *) malloc (sizeof (FcCharSet));
     if (!fcs)
        return 0;
-    FcMemAlloc (FC_MEM_CHARSET, sizeof (FcCharSet));
     fcs->ref = 1;
     fcs->num = 0;
     fcs->leaves_offset = 0;
@@ -64,19 +63,12 @@ FcCharSetDestroy (FcCharSet *fcs)
        if (--fcs->ref > 0)
            return;
        for (i = 0; i < fcs->num; i++)
-       {
-           FcMemFree (FC_MEM_CHARLEAF, sizeof (FcCharLeaf));
            free (FcCharSetLeaf (fcs, i));
-       }
        if (fcs->num)
        {
-           /* the numbers here are estimates */
-           FcMemFree (FC_MEM_CHARSET, fcs->num * sizeof (intptr_t));
            free (FcCharSetLeaves (fcs));
-           FcMemFree (FC_MEM_CHARSET, fcs->num * sizeof (FcChar16));
            free (FcCharSetNumbers (fcs));
        }
-       FcMemFree (FC_MEM_CHARSET, sizeof (FcCharSet));
        free (fcs);
     }
 }
@@ -157,24 +149,16 @@ FcCharSetPutLeaf (FcCharSet       *fcs,
         unsigned int alloced = 8;
        leaves = malloc (alloced * sizeof (*leaves));
        numbers = malloc (alloced * sizeof (*numbers));
-       FcMemAlloc (FC_MEM_CHARSET, alloced * sizeof (*leaves));
-       FcMemAlloc (FC_MEM_CHARSET, alloced * sizeof (*numbers));
       }
       else
       {
         unsigned int alloced = fcs->num;
        intptr_t *new_leaves, distance;
 
-       FcMemFree (FC_MEM_CHARSET, alloced * sizeof (*leaves));
-       FcMemFree (FC_MEM_CHARSET, alloced * sizeof (*numbers));
-
        alloced *= 2;
        new_leaves = realloc (leaves, alloced * sizeof (*leaves));
        numbers = realloc (numbers, alloced * sizeof (*numbers));
 
-       FcMemAlloc (FC_MEM_CHARSET, alloced * sizeof (*leaves));
-       FcMemAlloc (FC_MEM_CHARSET, alloced * sizeof (*numbers));
-
        distance = (intptr_t) new_leaves - (intptr_t) leaves;
        if (new_leaves && distance)
        {
@@ -227,7 +211,6 @@ FcCharSetFindLeafCreate (FcCharSet *fcs, FcChar32 ucs4)
        free (leaf);
        return 0;
     }
-    FcMemAlloc (FC_MEM_CHARLEAF, sizeof (FcCharLeaf));
     return leaf;
 }
 
@@ -239,7 +222,6 @@ FcCharSetInsertLeaf (FcCharSet *fcs, FcChar32 ucs4, FcCharLeaf *leaf)
     pos = FcCharSetFindLeafPos (fcs, ucs4);
     if (pos >= 0)
     {
-       FcMemFree (FC_MEM_CHARLEAF, sizeof (FcCharLeaf));
        free (FcCharSetLeaf (fcs, pos));
        FcCharSetLeaves(fcs)[pos] = FcPtrToOffset (FcCharSetLeaves(fcs),
                                                   leaf);
@@ -971,15 +953,12 @@ FcNameParseCharSet (FcChar8 *string)
 bail1:
     if (c->num)
     {
-       FcMemFree (FC_MEM_CHARSET, c->num * sizeof (FcCharLeaf *));
        free (FcCharSetLeaves (c));
     }
     if (c->num)
     {
-       FcMemFree (FC_MEM_CHARSET, c->num * sizeof (FcChar16));
        free (FcCharSetNumbers (c));
     }
-    FcMemFree (FC_MEM_CHARSET, sizeof (FcCharSet));
     free (c);
 bail0:
     return NULL;
@@ -1116,7 +1095,6 @@ FcCharLeafEntCreate (FcCharSetFreezer *freezer)
        freezer->current_block = freezer->leaf_blocks[freezer->leaf_block_count-1] = malloc (FC_CHAR_LEAF_BLOCK * sizeof (FcCharLeafEnt));
        if (!freezer->current_block)
            return 0;
-       FcMemAlloc (FC_MEM_CHARLEAF, FC_CHAR_LEAF_BLOCK * sizeof (FcCharLeafEnt));
        freezer->leaf_remain = FC_CHAR_LEAF_BLOCK;
     }
     freezer->leaf_remain--;
@@ -1223,7 +1201,6 @@ FcCharSetFreezeBase (FcCharSetFreezer *freezer, FcCharSet *fcs)
     ent = malloc (size);
     if (!ent)
        return 0;
-    FcMemAlloc (FC_MEM_CHARSET, size);
 
     freezer->charsets_allocated++;
 
@@ -1299,16 +1276,9 @@ FcCharSetFreeze (FcCharSetFreezer *freezer, const FcCharSet *fcs)
     freezer->leaves_seen += fcs->num;
 bail1:
     if (b->num)
-    {
-       FcMemFree (FC_MEM_CHARSET, b->num * sizeof (FcCharLeaf *));
        free (FcCharSetLeaves (b));
-    }
     if (b->num)
-    {
-       FcMemFree (FC_MEM_CHARSET, b->num * sizeof (FcChar16));
        free (FcCharSetNumbers (b));
-    }
-    FcMemFree (FC_MEM_CHARSET, sizeof (FcCharSet));
     free (b);
 bail0:
     return n;
@@ -1340,9 +1310,6 @@ FcCharSetFreezerDestroy (FcCharSetFreezer *freezer)
        for (ent = freezer->set_hash_table[i]; ent; ent = next)
        {
            next = ent->next;
-           FcMemFree (FC_MEM_CHARSET, (sizeof (FcCharSetEnt) +
-                                       ent->set.num * sizeof (FcCharLeaf *) +
-                                       ent->set.num * sizeof (FcChar16)));
            free (ent);
        }
     }
@@ -1358,10 +1325,7 @@ FcCharSetFreezerDestroy (FcCharSetFreezer *freezer)
     }
 
     for (i = 0; i < freezer->leaf_block_count; i++)
-    {
        free (freezer->leaf_blocks[i]);
-       FcMemFree (FC_MEM_CHARLEAF, FC_CHAR_LEAF_BLOCK * sizeof (FcCharLeafEnt));
-    }
 
     free (freezer->leaf_blocks);
     free (freezer);