Changeset 4975:1b8be0a0ba5f in roaraudio for roard

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.

Location:

roard

Files:

• driver.c (modified) (2 diffs)
• driver_sndio.c (modified) (1 diff)
• roard.c (modified) (2 diffs)
• sample.c (modified) (1 diff)

roard/driver.c

@@ -302 +302 @@
   return -1;
  } else {
-  driver = strdup(device);
+  driver = roar_mm_strdup(device);
 
   if ( (delm = strstr(driver, "#")) == NULL ) {
@@ -317 +317 @@
 
  if ( driver != NULL )
-  free(driver);
+  roar_mm_free(driver);
 
  return ret;

roard/driver_sndio.c

@@ -43 +43 @@
 }
 
-#define er() if ( self->shandle ) sio_close(self->shandle); \
-             if ( self->mhandle ) mio_close(self->mhandle); \
-             if ( self->device  ) free(self->device);       \
-             free(self);                                    \
+#define er() if ( self->shandle ) sio_close(self->shandle);   \
+             if ( self->mhandle ) mio_close(self->mhandle);   \
+             if ( self->device  ) roar_mm_free(self->device); \
+             roar_mm_free(self);                              \
              return -1
 

roard/roard.c

@@ -828 +828 @@
    if ( *addr == '/' ) {
     if ( (env_roar_proxy_backup = getenv("ROAR_PROXY")) != NULL ) {
-     env_roar_proxy_backup = strdup(env_roar_proxy_backup);
+     env_roar_proxy_backup = roar_mm_strdup(env_roar_proxy_backup);
      unsetenv("ROAR_PROXY");
     }
@@ -844 +844 @@
     if ( env_roar_proxy_backup != NULL ) {
      setenv("ROAR_PROXY", env_roar_proxy_backup, 0);
-     free(env_roar_proxy_backup);
+     roar_mm_free(env_roar_proxy_backup);
     }
 #else

roard/sample.c

@@ -77 +77 @@
   roar_buffer_free(c->data);
 
- free(c);
+ roar_mm_free(c);
 
  g_samples[id] = NULL;