Changeset 5001:af12e5845239 in roaraudio for libroar/memmgr.c

Timestamp:

05/24/11 00:09:13 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_mm_sizeof()

File:

• libroar/memmgr.c (modified) (3 diffs)

libroar/memmgr.c

@@ -50 +50 @@
 
 #ifdef ROAR_USE_MEMMGR
+ssize_t roar_mm_sizeof(void * buf) {
+ if ( buf == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( buf == _libroar_null_buffer_check )
+  return 0;
+
+ roar_err_set(ROAR_ERROR_NOTSUP);
+ return -1;
+}
+
 void * roar_mm_calloc(size_t nmemb, size_t size) {
  void * ret;
@@ -123 +136 @@
 
 void * roar_mm_realloc(void *ptr, size_t size) {
-#ifdef ROAR_HAVE_REALLOC
- void * ret;
+ void * ret;
+#ifndef ROAR_HAVE_REALLOC
+ ssize_t len;
 #endif
 
@@ -145 +159 @@
  return ret;
 #else
- _err(ROAR_ERROR_NOTSUP);
+ len = roar_mm_sizeof(ptr);
+ if ( len == -1 )
+  return NULL;
+
+ ret = roar_mm_malloc(size); 
+ if ( ret == NULL )
+  return NULL;
+
+ memcpy(ret, ptr, len > (ssize_t)size ? size : len);
+
+ return ret;
 #endif
 }