Changeset 4975:1b8be0a0ba5f in roaraudio for libroaresd

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:

• libroaresd/esdctl.c (modified) (8 diffs)

libroaresd/esdctl.c

@@ -69 +69 @@
 
 /* print server into to stdout */
-void esd_print_server_info( esd_server_info_t *server_info ) {
+void esd_print_server_info(esd_server_info_t *server_info ) {
  char buf[80] = "";
 
@@ -142 +142 @@
  struct roar_message    m;
 
- r = malloc(sizeof(esd_server_info_t));
+ r = roar_mm_malloc(sizeof(esd_server_info_t));
 
  if ( r == NULL )
@@ -157 +157 @@
 
  if ( roar_req(&con, &m, NULL) == -1 ) {
-  free(r);
+  roar_mm_free(r);
   return NULL;
  }
 
  if ( m.cmd != ROAR_CMD_OK ) {
-  free(r);
+  roar_mm_free(r);
   return NULL;
  }
 
  if ( roar_stream_m2s(&s, &m) == -1 ) {
-  free(r);
+  roar_mm_free(r);
   return NULL;
  }
@@ -188 +188 @@
 /* release all memory allocated for the server properties structure */
 void esd_free_server_info( esd_server_info_t *server_info ) {
- if (server_info)
-  free(server_info);
+ if (server_info != NULL)
+  roar_mm_free(server_info);
 }
 
@@ -208 +208 @@
  roar_connect_fh(con, esd);
 
- r = malloc(sizeof(esd_info_t));
+ r = roar_mm_malloc(sizeof(esd_info_t));
 
  if ( r == NULL )
@@ -234 +234 @@
    }
 
-   if ( (new_player = malloc(sizeof(esd_player_info_t))) == NULL ) {
+   if ( (new_player = roar_mm_malloc(sizeof(esd_player_info_t))) == NULL ) {
     ROAR_ERR("esd_get_all_info(*): can not alloc memory for new player! BAD");
     continue;
@@ -320 +320 @@
  player = info->player_list;
 
- while (player) {
+ while (player != NULL) {
   oplayer = player;
   player  = player->next;
 
-  free(oplayer);
+  roar_mm_free(oplayer);
  }
 
@@ -333 +333 @@
   sample  = sample->next;
 
-  free(osample);
- }
-
-  free(info);
+  roar_mm_free(osample);
+ }
+
+  roar_mm_free(info);
  }
 }