Changeset 4975:1b8be0a0ba5f in roaraudio for libroar

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.

Location:

libroar

Files:

• vio_cmd.c (modified) (5 diffs)
• vio_dstr.c (modified) (3 diffs)
• vio_stack.c (modified) (5 diffs)

libroar/vio_cmd.c

@@ -62 +62 @@
 
  if ( reader != NULL )
-  state->reader.cmd = strdup(reader);
+  state->reader.cmd = roar_mm_strdup(reader);
 
  state->writer.pid = -1;
@@ -69 +69 @@
 
  if ( writer != NULL )
-  state->writer.cmd = strdup(writer);
+  state->writer.cmd = roar_mm_strdup(writer);
 
  // init state
@@ -125 +125 @@
 
  if ( state->reader.cmd != NULL )
-  free(state->reader.cmd);
+  roar_mm_free(state->reader.cmd);
 
  if ( state->writer.cmd != NULL )
-  free(state->writer.cmd);
+  roar_mm_free(state->writer.cmd);
 
  roar_vio_close(state->next);
@@ -241 +241 @@
  state->child.out = -1;
 
- state->child.cmd = strdup(command);
+ state->child.cmd = roar_mm_strdup(command);
 
  // init state
@@ -281 +281 @@
 
  if ( state->child.cmd != NULL )
-  free(state->child.cmd);
+  roar_mm_free(state->child.cmd);
 
  roar_mm_free(state);

libroar/vio_dstr.c

@@ -770 +770 @@
   return -1;
 
- if ( roar_vio_open_stack(calls) == -1 )
+ if ( roar_vio_open_stack2(calls, NULL) == -1 )
   return -1;
 
@@ -776 +776 @@
 
  if ( (def = chain->def) != NULL ) {
-  if ( (tc = malloc(sizeof(struct roar_vio_calls))) == NULL ) {
+  if ( (tc = roar_mm_malloc(sizeof(struct roar_vio_calls))) == NULL ) {
    _ret(-1);
   }
 
   if ( roar_vio_clear_calls(tc) == -1 ) {
-   free(tc);
+   roar_mm_free(tc);
    _ret(-1);
   }
@@ -809 +809 @@
 
   if ( c->need_vio ) {
-   if ( (tc = malloc(sizeof(struct roar_vio_calls))) == NULL ) {
+   if ( (tc = roar_mm_malloc(sizeof(struct roar_vio_calls))) == NULL ) {
     _ret(-1);
    }
 
    if ( roar_vio_clear_calls(tc) == -1 ) {
-    free(tc);
+    roar_mm_free(tc);
     _ret(-1);
    }

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]);
  }