Changeset 4957:45ba4cf2abe3 in roaraudio for roard/codecfilter_speex.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/codecfilter_speex.c (modified) (5 diffs)

roard/codecfilter_speex.c

@@ -46 +46 @@
                                             struct roar_stream_server * info,
                                             struct roar_codecfilter   * filter) {
- struct codecfilter_speex_inst * self = malloc(sizeof(struct codecfilter_speex_inst));
+ struct codecfilter_speex_inst * self = roar_mm_malloc(sizeof(struct codecfilter_speex_inst));
  struct roar_stream * s = ROAR_STREAM(info);
 
@@ -61 +61 @@
   case 2: self->stereo = 1; break;
   default:
-    free(self);
+    roar_mm_free(self);
     return -1;
  }
@@ -111 +111 @@
  speex_bits_destroy(&(self->bits));
 
- if ( self->cd )
-  free(self->cd);
-
- if ( self->i_rest )
-  free(self->i_rest);
-
- free((void*)self);
+ if ( self->cd != NULL )
+  roar_mm_free(self->cd);
+
+ if ( self->i_rest != NULL )
+  roar_mm_free(self->i_rest);
+
+ roar_mm_free((void*)self);
 
  return 0;
@@ -171 +171 @@
   ROAR_DBG("cf_speex_read(*): frame_size=%i (%i bytes)", self->frame_size, fs2);
 
-  if ( !self->cd ) {
-   self->cd = malloc(fs2);
-   if ( !self->cd )
+  if ( self->cd == NULL ) {
+   self->cd = roar_mm_malloc(fs2);
+   if ( self->cd == NULL )
     return 0;
   }
 
-  if ( !self->i_rest ) {
-   self->i_rest = malloc(fs2);
-   if ( !self->i_rest )
+  if ( self->i_rest == NULL ) {
+   self->i_rest = roar_mm_malloc(fs2);
+   if ( self->i_rest == NULL )
     return 0;
   }
@@ -334 +334 @@
   fs2 = self->frame_size * _FS;
 
-  if ( !self->cd ) {
-   self->cd = malloc(fs2 + 2);
-   if ( !self->cd )
+  if ( self->cd == NULL ) {
+   self->cd = roar_mm_malloc(fs2 + 2);
+   if ( self->cd == NULL )
     return 0;
   }
 
-  if ( !self->o_rest ) {
-   self->o_rest = malloc(fs2);
-   if ( !self->o_rest )
+  if ( self->o_rest == NULL ) {
+   self->o_rest = roar_mm_malloc(fs2);
+   if ( self->o_rest == NULL )
     return 0;
   }