Changeset 4957:45ba4cf2abe3 in roaraudio for roard/driver_oss.c

Timestamp:

05/13/11 23:30:17 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use roar_mm_*() where possible

File:

• roard/driver_oss.c (modified) (3 diffs)

roard/driver_oss.c

@@ -345 +345 @@
 }
 
-#define er() close(self->fh); if ( self->device ) free(self->device); free(self); return -1
+#define er() close(self->fh); if ( self->device ) roar_mm_free(self->device); roar_mm_free(self); return -1
 int driver_oss_open(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) {
  struct driver_oss * self = NULL;
 
- if ( (self = malloc(sizeof(struct driver_oss))) == NULL ) {
-  ROAR_ERR("driver_oss_open(*): Can not malloc() instance data: %s", strerror(errno));
+ if ( (self = roar_mm_malloc(sizeof(struct driver_oss))) == NULL ) {
+  ROAR_ERR("driver_oss_open(*): Can not roar_mm_malloc() instance data: %s", strerror(errno));
   return -1;
  }
@@ -370 +370 @@
 
  if ( device != NULL )
-  self->device = strdup(device);
+  self->device = roar_mm_strdup(device);
 
  if ( driver_oss_init_vio(inst, self) == -1 ) {
@@ -419 +419 @@
 
  if ( _get(vio,device) != NULL )
-  free(_get(vio,device));
-
- free(vio->inst);
+  roar_mm_free(_get(vio,device));
+
+ roar_mm_free(vio->inst);
  return 0;
 }