Changeset 3063:955233719a84 in roaraudio for libroar

Timestamp:

12/26/09 20:36:31 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use memory functions from libroar, not libc, fixed a small memory leak

Location:

libroar

Files:

• stack.c (modified) (1 diff)
• vio_cmd.c (modified) (4 diffs)
• vio_pipe.c (modified) (7 diffs)
• vio_stack.c (modified) (2 diffs)

libroar/stack.c

@@ -48 +48 @@
 
 struct roar_stack * roar_stack_newalloc(void) {
- struct roar_stack * stack = malloc(sizeof(struct roar_stack));
+ struct roar_stack * stack = roar_mm_malloc(sizeof(struct roar_stack));
 
  if ( stack == NULL )

libroar/vio_cmd.c

@@ -46 +46 @@
   return -1;
 
- if ( (state = malloc(sizeof(struct roar_vio_cmd_state))) == NULL )
+ if ( (state = roar_mm_malloc(sizeof(struct roar_vio_cmd_state))) == NULL )
   return -1;
 
@@ -132 +132 @@
 
 // state->state = ROAR_VIO_CMD_STATE_CLOSED;
- free(state);
+ roar_mm_free(state);
 
  return 0;
@@ -226 +226 @@
   return -1;
 
- if ( (state = malloc(sizeof(struct roar_vio_2popen_state))) == NULL )
+ if ( (state = roar_mm_malloc(sizeof(struct roar_vio_2popen_state))) == NULL )
   return -1;
 
@@ -282 +282 @@
   free(state->child.cmd);
 
- free(state);
+ roar_mm_free(state);
 
  return 0;

libroar/vio_pipe.c

@@ -43 +43 @@
   return -1;
 
- if ( (self = malloc(sizeof(struct roar_vio_pipe))) == NULL )
+ if ( (self = roar_mm_malloc(sizeof(struct roar_vio_pipe))) == NULL )
   return -1;
 
@@ -65 +65 @@
     // no buffers need to be set up here,
     // we handle the NULL pointer in the reader and writer func
-    free(self);
+    roar_mm_free(self);
     return -1;
    break;
@@ -73 +73 @@
     if ( rw == O_RDWR || rw == O_RDONLY )
      if ( pipe(self->b.p) == -1 ) {
-      free(self);
+      roar_mm_free(self);
       return -1;
      }
@@ -80 +80 @@
       close(self->b.p[0]);
       close(self->b.p[1]);
-      free(self);
+      roar_mm_free(self);
       return -1;
      }
@@ -86 +86 @@
   case ROAR_VIO_PIPE_TYPE_SOCKET:
     if ( socketpair(AF_UNIX, SOCK_STREAM, 0, self->b.p) == -1 ) {
-     free(self);
+     roar_mm_free(self);
      return -1;
     }
@@ -99 +99 @@
    break;
   default:
-    free(self);
+    roar_mm_free(self);
     return -1;
  }
@@ -175 +175 @@
 
  if ( ! self->refcount ) {
-  free(self);
+  roar_mm_free(self);
  }
 

libroar/vio_stack.c

@@ -41 +41 @@
   return -1;
 
- if ( (self = malloc(sizeof(struct roar_vio_stack))) == NULL )
+ if ( (self = roar_mm_malloc(sizeof(struct roar_vio_stack))) == NULL )
   return -1;
 
@@ -94 +94 @@
  }
 
- free(self);
+ roar_mm_free(self);
 
  return 0;