Changeset 2976:41c1c4bae1d4 in roaraudio
- Timestamp:
- 10/22/09 19:26:49 (15 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/libroar.h
r2812 r2976 87 87 #include "config.h" 88 88 #include "debug.h" 89 #include "memmgr.h" 89 90 #include "stack.h" 90 91 #include "buffer.h" -
libroar/buffer.c
r2334 r2976 38 38 void * data; 39 39 40 if ((data = malloc(len)) == NULL) {40 if ((data = roar_mm_malloc(len)) == NULL) { 41 41 return -1; 42 42 } 43 43 44 44 if ( roar_buffer_new_no_ma(buf, len, data) == -1 ) { 45 free(data);45 roar_mm_free(data); 46 46 return -1; 47 47 } … … 49 49 if ( roar_buffer_set_flag(*buf, ROAR_BUFFER_FLAG_NOFREE, ROAR_BUFFER_RESET) == -1 ) { 50 50 roar_buffer_free(*buf); 51 free(data);51 roar_mm_free(data); 52 52 return -1; 53 53 } … … 64 64 return -1; 65 65 66 if ((new = malloc(sizeof(struct roar_buffer))) == NULL) {66 if ((new = roar_mm_malloc(sizeof(struct roar_buffer))) == NULL) { 67 67 *buf = NULL; 68 68 return -1; … … 93 93 94 94 while ((next = buf->next)) { 95 free(buf->data); 96 free(buf); 95 if ( roar_buffer_get_flag(buf, ROAR_BUFFER_FLAG_NOFREE) != 1 ) 96 roar_mm_free(buf->data); 97 98 roar_mm_free(buf); 97 99 buf = next; 98 100 } 99 101 100 102 if ( roar_buffer_get_flag(buf, ROAR_BUFFER_FLAG_NOFREE) != 1 ) 101 free(buf->data);102 103 free(buf);103 roar_mm_free(buf->data); 104 105 roar_mm_free(buf); 104 106 105 107 return 0; … … 118 120 *next = buf->next; 119 121 120 free(buf->data); 121 free(buf); 122 if ( roar_buffer_get_flag(buf, ROAR_BUFFER_FLAG_NOFREE) != 1 ) 123 roar_mm_free(buf->data); 124 125 roar_mm_free(buf); 122 126 123 127 ROAR_DBG("buffer_delete(buf=%p, next=%p) = 0", buf, next);
Note: See TracChangeset
for help on using the changeset viewer.