Changeset 2976:41c1c4bae1d4 in roaraudio

Timestamp:

10/22/09 19:26:49 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added memmgr.h, allready used by buffer

Files:

• include/libroar/libroar.h (modified) (1 diff)
• include/libroar/memmgr.h (added)
• libroar/buffer.c (modified) (5 diffs)

include/libroar/libroar.h

@@ -87 +87 @@
 #include "config.h"
 #include "debug.h"
+#include "memmgr.h"
 #include "stack.h"
 #include "buffer.h"

libroar/buffer.c

@@ -38 +38 @@
  void * data;
 
- if ((data = malloc(len)) == NULL) {
+ if ((data = roar_mm_malloc(len)) == NULL) {
   return -1;
  }
 
  if ( roar_buffer_new_no_ma(buf, len, data) == -1 ) {
-  free(data);
+  roar_mm_free(data);
   return -1;
  }
@@ -49 +49 @@
  if ( roar_buffer_set_flag(*buf, ROAR_BUFFER_FLAG_NOFREE, ROAR_BUFFER_RESET) == -1 ) {
   roar_buffer_free(*buf);
-  free(data);
+  roar_mm_free(data);
   return -1;
  }
@@ -64 +64 @@
   return -1;
 
- if ((new = malloc(sizeof(struct roar_buffer))) == NULL) {
+ if ((new = roar_mm_malloc(sizeof(struct roar_buffer))) == NULL) {
   *buf = NULL;
   return -1;
@@ -93 +93 @@
 
  while ((next = buf->next)) {
-  free(buf->data);
-  free(buf);
+  if ( roar_buffer_get_flag(buf, ROAR_BUFFER_FLAG_NOFREE) != 1 )
+   roar_mm_free(buf->data);
+
+  roar_mm_free(buf);
   buf = next;
  }
 
  if ( roar_buffer_get_flag(buf, ROAR_BUFFER_FLAG_NOFREE) != 1 )
-  free(buf->data);
-
- free(buf);
+  roar_mm_free(buf->data);
+
+ roar_mm_free(buf);
 
  return 0;
@@ -118 +120 @@
   *next = buf->next;
 
- free(buf->data);
- free(buf);
+ if ( roar_buffer_get_flag(buf, ROAR_BUFFER_FLAG_NOFREE) != 1 )
+  roar_mm_free(buf->data);
+
+ roar_mm_free(buf);
 
  ROAR_DBG("buffer_delete(buf=%p, next=%p) = 0", buf, next);