Changeset 4957:45ba4cf2abe3 in roaraudio for roard/container_framework.c

Timestamp:

05/13/11 23:30:17 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use roar_mm_*() where possible

File:

• roard/container_framework.c (modified) (6 diffs)

roard/container_framework.c

@@ -43 +43 @@
   return -1;
 
- if ( (self = malloc(sizeof(struct cont_fw_parent_inst))) == NULL ) {
+ if ( (self = roar_mm_malloc(sizeof(struct cont_fw_parent_inst))) == NULL ) {
   *inst = NULL;
   return -1;
@@ -54 +54 @@
 
  if ( cont_pvio_open(&(self->vio), self) == -1 ) {
-  free(self);
+  roar_mm_free(self);
   return -1;
  }
@@ -85 +85 @@
   inst->pcb.close(inst);
 
- free(inst);
+ roar_mm_free(inst);
 
  ROAR_DBG("cont_fw_delete(inst=%p) = 0", inst);
@@ -135 +135 @@
   return -1;
 
- if ( (self = malloc(sizeof(struct cont_fw_child_vio_inst))) == NULL )
+ if ( (self = roar_mm_malloc(sizeof(struct cont_fw_child_vio_inst))) == NULL )
   return -1;
 
@@ -149 +149 @@
   if ( inst->pcb.new_child(inst, self) == -1 ) {
    inst->child[i] = NULL;
-   free(self);
+   roar_mm_free(self);
    return -1;
   }
@@ -229 +229 @@
  }
 
- free(inst);
+ roar_mm_free(inst);
 
  return  r;