Changeset 5001:af12e5845239 in roaraudio
- Timestamp:
- 05/24/11 00:09:13 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/memmgr.h
r4974 r5001 47 47 #ifdef ROAR_USE_MEMMGR 48 48 // those functions are currently not implemeted: 49 50 ssize_t roar_mm_sizeof(void * buf); 51 49 52 void * roar_mm_calloc(size_t nmemb, size_t size); 50 53 void * roar_mm_malloc(size_t size); … … 58 61 59 62 #else 63 #define roar_mm_sizeof(ptr) ((ssize_t)-1) 60 64 #define roar_mm_calloc(nmemb, size) calloc((nmemb), (size)) 61 65 #define roar_mm_malloc(size) malloc((size)) -
libroar/memmgr.c
r4992 r5001 50 50 51 51 #ifdef ROAR_USE_MEMMGR 52 ssize_t roar_mm_sizeof(void * buf) { 53 if ( buf == NULL ) { 54 roar_err_set(ROAR_ERROR_FAULT); 55 return -1; 56 } 57 58 if ( buf == _libroar_null_buffer_check ) 59 return 0; 60 61 roar_err_set(ROAR_ERROR_NOTSUP); 62 return -1; 63 } 64 52 65 void * roar_mm_calloc(size_t nmemb, size_t size) { 53 66 void * ret; … … 123 136 124 137 void * roar_mm_realloc(void *ptr, size_t size) { 125 #ifdef ROAR_HAVE_REALLOC 126 void * ret; 138 void * ret; 139 #ifndef ROAR_HAVE_REALLOC 140 ssize_t len; 127 141 #endif 128 142 … … 145 159 return ret; 146 160 #else 147 _err(ROAR_ERROR_NOTSUP); 161 len = roar_mm_sizeof(ptr); 162 if ( len == -1 ) 163 return NULL; 164 165 ret = roar_mm_malloc(size); 166 if ( ret == NULL ) 167 return NULL; 168 169 memcpy(ret, ptr, len > (ssize_t)size ? size : len); 170 171 return ret; 148 172 #endif 149 173 }
Note: See TracChangeset
for help on using the changeset viewer.