Browse Source

fix the new functions so that they compile at least.

release0.1.5
Georg Hopp 12 years ago
parent
commit
f2565a9b77
  1. 37
      src/utils/memory.c

37
src/utils/memory.c

@ -49,7 +49,7 @@
struct memSegment { struct memSegment {
size_t size; size_t size;
void * ptr; void * ptr;
}
};
void ** segments = NULL; void ** segments = NULL;
@ -64,7 +64,7 @@ static
int int
segmentFindCmp(const void * size_ptr, const void * subject) segmentFindCmp(const void * size_ptr, const void * subject)
{ {
if (*size_ptr < subject->size)
if (*(size_t *)size_ptr < ((struct memSegment *)subject)->size)
return -1; return -1;
return 0; return 0;
@ -80,28 +80,21 @@ segmentFindCmp(const void * size_ptr, const void * subject)
*/ */
static static
int int
segmentSearchCmd(const void * search, const void * subject)
segmentSearchCmp(const void * search, const void * subject)
{ {
size_t idx = search->size - subject->size;
size_t idx =
((struct memSegment *)search)->size -
((struct memSegment *)subject)->size;
if (0 == idx) { if (0 == idx) {
return search->ptr - subject->ptr;
return
((struct memSegment *)search)->ptr -
((struct memSegment *)subject)->ptr;
} }
return idx; return idx;
} }
/**
* we do NOT ensure that the memory region is zeroed
* because we want the best performance.
* Most times this is not neccessary at all.
*/
struct memSegment *
memCalloc(size_t nmemb, size_t size)
{
return memMalloc(nmemb * size);
}
struct memSegment * struct memSegment *
memMalloc(size_t size) memMalloc(size_t size)
@ -121,6 +114,18 @@ memMalloc(size_t size)
return seg; return seg;
} }
/**
* we do NOT ensure that the memory region is zeroed
* because we want the best performance.
* Most times this is not neccessary at all.
*/
struct memSegment *
memCalloc(size_t nmemb, size_t size)
{
return memMalloc(nmemb * size);
}
void void
ffree(void ** data) ffree(void ** data)
{ {

Loading…
Cancel
Save