From a9b5904826c3981234eda971a3a8043d5c771029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
 <zmoelnig@users.sourceforge.net>
Date: Sun, 12 Nov 2006 12:57:30 +0000
Subject: reduced compiler warnings by avoiding variable shadowing

svn path=/trunk/externals/iemlib/; revision=6271
---
 src/iem_mp3/mp3play~.c | 30 +++++++++++++++---------------
 src/iemlib1/prvu~.c    | 10 +++++-----
 src/iemlib1/rvu~.c     |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/iem_mp3/mp3play~.c b/src/iem_mp3/mp3play~.c
index e87d108..bedabf4 100644
--- a/src/iem_mp3/mp3play~.c
+++ b/src/iem_mp3/mp3play~.c
@@ -771,7 +771,7 @@ static void ExitMP3(struct iemmp3Struct *mp)
 
 static int decodeMP3(struct iemmp3Struct *mp, char *in, int isize, char *out, int osize, int *done)
 {
-    int len,error=1;
+    int len,err=1;
 
     iemmp3_gmp = mp;
 
@@ -836,8 +836,8 @@ static int decodeMP3(struct iemmp3Struct *mp, char *in, int isize, char *out, in
     *done = 0;
     if(mp->fr.error_protection)
   getbits(16);
-    do_layer3(&mp->fr,(unsigned char *) out,done,&error);
-    if(!error)
+    do_layer3(&mp->fr,(unsigned char *) out,done,&err);
+    if(!err)
   return MP3_EX;
 
     mp->fsizeold = mp->framesize;
@@ -987,15 +987,15 @@ static void init_layer3(int down_sample_sblimit)
   bdf = bi->shortDiff+3;
   for(cb=3;cb<13;cb++)
   {
-      int l = (*bdf++) >> 1;
+      int l1 = (*bdf++) >> 1;
       for(lwin=0;lwin<3;lwin++)
       {
-    *mp++ = l;
+    *mp++ = l1;
     *mp++ = i + lwin;
     *mp++ = lwin;
     *mp++ = cb;
       }
-      i += 6*l;
+      i += 6*l1;
   }
   iemmp3_mapend[j][0] = mp;
 
@@ -1003,15 +1003,15 @@ static void init_layer3(int down_sample_sblimit)
   bdf = bi->shortDiff+0;
   for(i=0,cb=0;cb<13;cb++)
   {
-      int l = (*bdf++) >> 1;
+      int l1 = (*bdf++) >> 1;
       for(lwin=0;lwin<3;lwin++)
       {
-    *mp++ = l;
+    *mp++ = l1;
     *mp++ = i + lwin;
     *mp++ = lwin;
     *mp++ = cb;
       }
-      i += 6*l;
+      i += 6*l1;
   }
   iemmp3_mapend[j][1] = mp;
 
@@ -1175,17 +1175,17 @@ static int read_buf_byte(struct iemmp3Struct *mp,int *err)
 static int read_head(struct iemmp3Struct *mp)
 {
     unsigned long head;
-    int error=1;
+    int err=1;
 
-    head = read_buf_byte(mp,&error);
+    head = read_buf_byte(mp,&err);
     head <<= 8;
-    head |= read_buf_byte(mp,&error);
+    head |= read_buf_byte(mp,&err);
     head <<= 8;
-    head |= read_buf_byte(mp,&error);
+    head |= read_buf_byte(mp,&err);
     head <<= 8;
-    head |= read_buf_byte(mp,&error);
+    head |= read_buf_byte(mp,&err);
     mp->header = head;
-    return(error);
+    return(err);
 }
 
 static int decode_header(struct iemmp3_frame *fr,unsigned long newhead)
diff --git a/src/iemlib1/prvu~.c b/src/iemlib1/prvu~.c
index 17fe143..aed7c53 100644
--- a/src/iemlib1/prvu~.c
+++ b/src/iemlib1/prvu~.c
@@ -114,17 +114,17 @@ static t_int *prvu_tilde_perform(t_int *w)
   t_float *in = (t_float *)(w[1]);
   t_prvu_tilde *x = (t_prvu_tilde *)(w[2]);
   int n = (int)(w[3]);
-  t_float peak = x->x_cur_peak, pow, sum=x->x_sum_rms;
+  t_float peak = x->x_cur_peak, power, sum=x->x_sum_rms;
   int i;
   
   if(x->x_started)
   {
     for(i=0; i<n; i++)
     {
-      pow = in[i]*in[i];
-      if(pow > peak)
-        peak = pow;
-      sum += pow;
+      power = in[i]*in[i];
+      if(power > peak)
+        peak = power;
+      sum += power;
     }
     x->x_cur_peak = peak;
     x->x_sum_rms = sum;
diff --git a/src/iemlib1/rvu~.c b/src/iemlib1/rvu~.c
index 95a874a..21638d5 100644
--- a/src/iemlib1/rvu~.c
+++ b/src/iemlib1/rvu~.c
@@ -84,7 +84,7 @@ static t_int *rvu_tilde_perform(t_int *w)
   t_float *in = (t_float *)(w[1]);
   t_rvu_tilde *x = (t_rvu_tilde *)(w[2]);
   int n = (int)(w[3]);
-  t_float pow, sum=x->x_sum_rms;
+  t_float sum=x->x_sum_rms;
   int i;
   
   if(x->x_started)
-- 
cgit v1.2.1