Changeset 4975:1b8be0a0ba5f in roaraudio for libroar/vio_stack.c

Timestamp:

05/16/11 15:16:33 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

removed more usages of system's malloc()/free() calles.

File:

• libroar/vio_stack.c (modified) (5 diffs)

libroar/vio_stack.c

@@ -37 +37 @@
 
 int     roar_vio_open_stack    (struct roar_vio_calls * calls) {
+ return roar_vio_open_stack2(calls, free);
+}
+
+int     roar_vio_open_stack2   (struct roar_vio_calls * calls, void (*func)(void*)) {
  struct roar_vio_stack * self;
 
- if ( calls == NULL )
-  return -1;
+ if ( calls == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( func == NULL )
+  func = roar_mm_free_retvoid;
 
  if ( (self = roar_mm_malloc(sizeof(struct roar_vio_stack))) == NULL )
@@ -47 +56 @@
  memset(self,  0, sizeof(struct roar_vio_stack));
  memset(calls, 0, sizeof(struct roar_vio_calls));
+
+ self->free      = func;
 
  calls->inst     = self;
@@ -63 +74 @@
  struct roar_vio_stack * self;
 
- if ( calls == NULL || vio == NULL )
-  return -1;
-
- if ( (self = calls->inst) == NULL )
-  return -1;
+ if ( calls == NULL || vio == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( (self = calls->inst) == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  if ( self->next == ROAR_VIO_STACK_MAX )
@@ -81 +96 @@
  int i;
 
- if ( vio == NULL )
-  return -1;
+ if ( vio == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  if ( (self = vio->inst) == NULL )
@@ -92 +109 @@
 
   for (i = 0; i < self->next; i++)
-   free(self->calls[i]);
+   self->free(self->calls[i]);
  }