Bug 5094 - Code cleanup, patch by Zack Middleton and DevHC. Fixes unused-but-set gcc warnings

4 files changed, 12 insertions, 11 deletions

diff --git a/src/libspeex/cb_search.c b/src/libspeex/cb_search.c
index 63f4c6a4..39ad50c2 100644
--- a/src/libspeex/cb_search.c
+++ b/src/libspeex/cb_search.c
@@ -524,14 +524,15 @@ spx_int32_t *seed
    VARDECL(int *ind);
    VARDECL(int *signs);
    const signed char *shape_cb;
-   int shape_cb_size, subvect_size, nb_subvect;
+   //int shape_cb_size;
+   int subvect_size, nb_subvect;
    const split_cb_params *params;
    int have_sign;
 
    params = (const split_cb_params *) par;
    subvect_size = params->subvect_size;
    nb_subvect = params->nb_subvect;
-   shape_cb_size = 1<<params->shape_bits;
+   //shape_cb_size = 1<<params->shape_bits;
    shape_cb = params->shape_cb;
    have_sign = params->have_sign;
 
diff --git a/src/libspeex/jitter.c b/src/libspeex/jitter.c
index 6a32e754..a1fbd88e 100644
--- a/src/libspeex/jitter.c
+++ b/src/libspeex/jitter.c
@@ -463,7 +463,7 @@ int jitter_buffer_get(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int3
 {
    int i;
    unsigned int j;
-   int incomplete = 0;
+   //int incomplete = 0;
    spx_int16_t opt;
    
    if (start_offset != NULL)
@@ -568,7 +568,7 @@ int jitter_buffer_get(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int3
       if (found)
       {
          i=besti;
-         incomplete = 1;
+         //incomplete = 1;
          /*fprintf (stderr, "incomplete: %d %d %d %d\n", jitter->packets[i].timestamp, jitter->pointer_timestamp, chunk_size, jitter->packets[i].span);*/
       }
    }
diff --git a/src/libspeex/nb_celp.c b/src/libspeex/nb_celp.c
index 9dd726a0..52e360d2 100644
--- a/src/libspeex/nb_celp.c
+++ b/src/libspeex/nb_celp.c
@@ -1300,7 +1300,7 @@ int nb_decode(void *state, SpeexBits *bits, void *vout)
    {
       int offset;
       spx_word16_t *exc;
-      spx_word16_t *sp;
+      //spx_word16_t *sp;
       spx_word16_t *innov_save = NULL;
       spx_word16_t tmp;
 
@@ -1309,7 +1309,7 @@ int nb_decode(void *state, SpeexBits *bits, void *vout)
       /* Excitation */
       exc=st->exc+offset;
       /* Original signal */
-      sp=out+offset;
+      //sp=out+offset;
       if (st->innov_save)
          innov_save = st->innov_save+offset;
 
@@ -1502,13 +1502,13 @@ int nb_decode(void *state, SpeexBits *bits, void *vout)
    {
       int offset;
       spx_word16_t *sp;
-      spx_word16_t *exc;
+      //spx_word16_t *exc;
       /* Offset relative to start of frame */
       offset = st->subframeSize*sub;
       /* Original signal */
       sp=out+offset;
       /* Excitation */
-      exc=st->exc+offset;
+      //exc=st->exc+offset;
 
       /* LSP interpolation (quantized and unquantized) */
       lsp_interpolate(st->old_qlsp, qlsp, interp_qlsp, st->lpcSize, sub, st->nbSubframes);
diff --git a/src/libspeex/vbr.c b/src/libspeex/vbr.c
index 5b7dd9bf..33df777d 100644
--- a/src/libspeex/vbr.c
+++ b/src/libspeex/vbr.c
@@ -126,7 +126,7 @@ float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float p
    int i;
    float ener=0, ener1=0, ener2=0;
    float qual=7;
-   int va;
+   //int va;
    float log_energy;
    float non_st=0;
    float voicing;
@@ -159,7 +159,7 @@ float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float p
        || (voicing<0 && non_st < .05))
    {
       float tmp;
-      va = 0;
+      //va = 0;
       vbr->consec_noise++;
       if (pow_ener > 3*vbr->noise_level)
          tmp = 3*vbr->noise_level;
@@ -171,7 +171,7 @@ float vbr_analysis(VBRState *vbr, spx_word16_t *sig, int len, int pitch, float p
          vbr->noise_accum_count = .95*vbr->noise_accum_count + .05;
       }
    } else {
-      va = 1;
+      //va = 1;
       vbr->consec_noise=0;
    }