Changeset 4975:1b8be0a0ba5f in roaraudio for libroaresd/esdctl.c
- Timestamp:
- 05/16/11 15:16:33 (13 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroaresd/esdctl.c
r4708 r4975 69 69 70 70 /* print server into to stdout */ 71 void esd_print_server_info( 71 void esd_print_server_info(esd_server_info_t *server_info ) { 72 72 char buf[80] = ""; 73 73 … … 142 142 struct roar_message m; 143 143 144 r = malloc(sizeof(esd_server_info_t));144 r = roar_mm_malloc(sizeof(esd_server_info_t)); 145 145 146 146 if ( r == NULL ) … … 157 157 158 158 if ( roar_req(&con, &m, NULL) == -1 ) { 159 free(r);159 roar_mm_free(r); 160 160 return NULL; 161 161 } 162 162 163 163 if ( m.cmd != ROAR_CMD_OK ) { 164 free(r);164 roar_mm_free(r); 165 165 return NULL; 166 166 } 167 167 168 168 if ( roar_stream_m2s(&s, &m) == -1 ) { 169 free(r);169 roar_mm_free(r); 170 170 return NULL; 171 171 } … … 188 188 /* release all memory allocated for the server properties structure */ 189 189 void esd_free_server_info( esd_server_info_t *server_info ) { 190 if (server_info )191 free(server_info);190 if (server_info != NULL) 191 roar_mm_free(server_info); 192 192 } 193 193 … … 208 208 roar_connect_fh(con, esd); 209 209 210 r = malloc(sizeof(esd_info_t));210 r = roar_mm_malloc(sizeof(esd_info_t)); 211 211 212 212 if ( r == NULL ) … … 234 234 } 235 235 236 if ( (new_player = malloc(sizeof(esd_player_info_t))) == NULL ) {236 if ( (new_player = roar_mm_malloc(sizeof(esd_player_info_t))) == NULL ) { 237 237 ROAR_ERR("esd_get_all_info(*): can not alloc memory for new player! BAD"); 238 238 continue; … … 320 320 player = info->player_list; 321 321 322 while (player ) {322 while (player != NULL) { 323 323 oplayer = player; 324 324 player = player->next; 325 325 326 free(oplayer);326 roar_mm_free(oplayer); 327 327 } 328 328 … … 333 333 sample = sample->next; 334 334 335 free(osample);336 } 337 338 free(info);335 roar_mm_free(osample); 336 } 337 338 roar_mm_free(info); 339 339 } 340 340 }
Note: See TracChangeset
for help on using the changeset viewer.