Changeset 4957:45ba4cf2abe3 in roaraudio for roard/driver_oss.c
- Timestamp:
- 05/13/11 23:30:17 (13 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/driver_oss.c
r4846 r4957 345 345 } 346 346 347 #define er() close(self->fh); if ( self->device ) free(self->device);free(self); return -1347 #define er() close(self->fh); if ( self->device ) roar_mm_free(self->device); roar_mm_free(self); return -1 348 348 int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 349 349 struct driver_oss * self = NULL; 350 350 351 if ( (self = malloc(sizeof(struct driver_oss))) == NULL ) {352 ROAR_ERR("driver_oss_open(*): Can not malloc() instance data: %s", strerror(errno));351 if ( (self = roar_mm_malloc(sizeof(struct driver_oss))) == NULL ) { 352 ROAR_ERR("driver_oss_open(*): Can not roar_mm_malloc() instance data: %s", strerror(errno)); 353 353 return -1; 354 354 } … … 370 370 371 371 if ( device != NULL ) 372 self->device = strdup(device);372 self->device = roar_mm_strdup(device); 373 373 374 374 if ( driver_oss_init_vio(inst, self) == -1 ) { … … 419 419 420 420 if ( _get(vio,device) != NULL ) 421 free(_get(vio,device));422 423 free(vio->inst);421 roar_mm_free(_get(vio,device)); 422 423 roar_mm_free(vio->inst); 424 424 return 0; 425 425 }
Note: See TracChangeset
for help on using the changeset viewer.