diff options
Diffstat (limited to 'nx-X11/programs/Xserver/record/set.c')
| -rw-r--r-- | nx-X11/programs/Xserver/record/set.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/record/set.c b/nx-X11/programs/Xserver/record/set.c index 83fb0e7d7..b7360a565 100644 --- a/nx-X11/programs/Xserver/record/set.c +++ b/nx-X11/programs/Xserver/record/set.c @@ -72,19 +72,9 @@ typedef int Bool; typedef unsigned short CARD16; -#define xalloc malloc -#define xfree free #define ALLOCATE_LOCAL malloc #define DEALLOCATE_LOCAL free -void *Xcalloc(size) - int size; -{ - void *p = malloc(size); - if (p) memset(p, 0, size); - return p; -} - #ifndef max #define max(_a, _b) ( ((_a) > (_b)) ? (_a) : (_b) ) #endif @@ -135,7 +125,7 @@ static void BitVectorDestroySet(pSet) RecordSetPtr pSet; { - xfree(pSet); + free(pSet); } static unsigned long @@ -260,7 +250,7 @@ BitVectorCreateSet(pIntervals, nIntervals, pMem, memsize) } else { - pbvs = (BitVectorSetPtr)Xcalloc(memsize); + pbvs = (BitVectorSetPtr)calloc(1, memsize); if (!pbvs) return NULL; pbvs->baseSet.ops = &BitVectorSetOperations; } @@ -295,7 +285,7 @@ static void IntervalListDestroySet(pSet) RecordSetPtr pSet; { - xfree(pSet); + free(pSet); } static unsigned long @@ -425,7 +415,7 @@ IntervalListCreateSet(pIntervals, nIntervals, pMem, memsize) else { prls = (IntervalListSetPtr) - xalloc(sizeof(IntervalListSet) + nIntervals * sizeof(RecordSetInterval)); + malloc(sizeof(IntervalListSet) + nIntervals * sizeof(RecordSetInterval)); if (!prls) goto bailout; prls->baseSet.ops = &IntervalListSetOperations; } @@ -612,7 +602,7 @@ int main(argc, argv) _RecordForceSetImplementation(IntervalListImplementation); rsize = RecordSetMemoryRequirements(intervals, nIntervals, &ralign); pad = (ralign - (bsize & (ralign - 1))) & (ralign - 1); - bs = (RecordSetPtr)xalloc(bsize + pad + rsize ); + bs = (RecordSetPtr)malloc(bsize + pad + rsize ); if (!bs) { fprintf(stderr, "%d: failed to alloc memory for sets\n", @@ -702,7 +692,7 @@ int main(argc, argv) if (testcount & 1) { - xfree(bs); + free(bs); } } } |