shithub: sox

Info  •  Files  •  Log  •  Branches

Fix GCC 4.6 warnings.

--- a/src/ima_rw.c

+++ b/src/ima_rw.c

@@ -252,16 +252,15 @@

         int opt             /* non-zero allows some cpu-intensive code to improve output */

 )

 {

-        int snext,d;

+        int snext;

         int s0,d0;

-        int s32,d32;

-        s32 = s0 = *st;

+        s0 = *st;

         if (opt>0) {

                 int low,hi,w;

                 int low0,hi0;

                 snext = s0;

-                d32 = d0 = ImaMashS(ch, chans, ip[0], ip,n,&snext, NULL);

+                d0 = ImaMashS(ch, chans, ip[0], ip,n,&snext, NULL);

                 w = 0;

                 low=hi=s0;

@@ -292,7 +291,7 @@

                 }

                 *st = s0;

         }

-        d = ImaMashS(ch, chans, ip[0], ip,n,st, obuff);

+        ImaMashS(ch, chans, ip[0], ip,n,st, obuff);

 }

 /* mash one block.  if you want to use opt>0, 9 is a reasonable value */

--- a/src/reverb.c

+++ b/src/reverb.c

@@ -21,7 +21,6 @@

 #include "fifo.h"

 #define lsx_zalloc(var, n) var = lsx_calloc(n, sizeof(*var))

-#define filter_create(p, n) (p)->ptr=lsx_zalloc((p)->buffer, (p)->size=(size_t)(n))

 #define filter_advance(p) if (--(p)->ptr < (p)->buffer) (p)->ptr += (p)->size

 #define filter_delete(p) free((p)->buffer)

@@ -69,14 +68,14 @@

   for (i = 0; i < array_length(comb_lengths); ++i, offset = -offset)

   {

     filter_t * pcomb = &p->comb[i];

-    double n = scale * r * (comb_lengths[i] + stereo_adjust * offset) + .5;

-    filter_create(pcomb, n);

+    pcomb->size = (size_t)(scale * r * (comb_lengths[i] + stereo_adjust * offset) + .5);

+    pcomb->ptr = lsx_zalloc(pcomb->buffer, pcomb->size);

   }

   for (i = 0; i < array_length(allpass_lengths); ++i, offset = -offset)

   {

     filter_t * pallpass = &p->allpass[i];

-    double n = r * (allpass_lengths[i] + stereo_adjust * offset) + .5;

-    filter_create(pallpass, n);

+    pallpass->size = (size_t)(r * (allpass_lengths[i] + stereo_adjust * offset) + .5);

+    pallpass->ptr = lsx_zalloc(pallpass->buffer, pallpass->size);

   }

 }