Changeset 3063:955233719a84 in roaraudio for roard

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:

roard

Files:

• clients.c (modified) (3 diffs)
• streams.c (modified) (2 diffs)

roard/clients.c

@@ -51 +51 @@
  for (i = 0; i < ROAR_CLIENTS_MAX; i++) {
   if ( g_clients[i] == NULL ) {
-   n = malloc(sizeof(struct roar_client));
+   n = roar_mm_malloc(sizeof(struct roar_client));
    if ( n != NULL ) {
     n->pid    = -1;
@@ -71 +71 @@
 
     if ( roar_nnode_new(&(n->nnode), ROAR_SOCKET_TYPE_UNKNOWN) == -1 ) {
-     free(n);
+     roar_mm_free(n);
      return -1;
     }
@@ -114 +114 @@
  roar_nnode_free(&(g_clients[id]->nnode));
 
- free(g_clients[id]);
+ roar_mm_free(g_clients[id]);
  g_clients[id] = NULL;
 

roard/streams.c

@@ -68 +68 @@
  for (i = 0; i < ROAR_STREAMS_MAX; i++) {
   if ( g_streams[i] == NULL ) {
-   s = ROAR_STREAM_SERVER(n = ROAR_STREAM(malloc(sizeof(struct roar_stream_server))));
+   s = ROAR_STREAM_SERVER(n = ROAR_STREAM(roar_mm_malloc(sizeof(struct roar_stream_server))));
    if ( n == NULL ) {
     ROAR_ERR("streams_new(void): can not allocate memory for new stream: %s", strerror(errno));
@@ -252 +252 @@
   free(s->name);
 
- free(s);
+ roar_mm_free(s);
 
  g_streams[id] = NULL;