mp3: sparse: fix warnings reported with -Wshadow

sendDataToOutputBuffer returns an int (and always has), and using the existing 'ret' is fine in mp3Read(). git-svn-id: https://svn.musicpd.org/mpd/trunk@5246 09075e82-0dd4-0310-85a5-a0d7c8717e4f

mp3: sparse: fix warnings reported with -Wshadow
71bcc165 · Eric Wong · 5ae84b7d · 71bcc165
Commit 71bcc165 authored Jan 14, 2007 by Eric Wong
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 8 deletions

mp3_plugin.c src/inputPlugins/mp3_plugin.c +7 -8

No files found.
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -876,7 +876,6 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
 			}
 			if (data->outputPtr >= data->outputBufferEnd) {
-				long ret;
 				ret = sendDataToOutputBuffer(cb,
 							     data->inStream,
 							     dc,
@@ -901,21 +900,21 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
 		data->decodedFirstFrame = 1;
 		if (dc->seek && data->inStream->seekable) {
-			long i = 0;
+			long j = 0;
 			data->muteFrame = MUTEFRAME_SEEK;
-			while (i < data->highestFrame && dc->seekWhere >
+			while (j < data->highestFrame && dc->seekWhere >
-			       ((float)mad_timer_count(data->times[i],
+			       ((float)mad_timer_count(data->times[j],
 						       MAD_UNITS_MILLISECONDS))
 			       / 1000) {
-				i++;
+				j++;
 			}
-			if (i < data->highestFrame) {
+			if (j < data->highestFrame) {
 				if (seekMp3InputBuffer(data,
-						       data->frameOffset[i]) ==
+						       data->frameOffset[j]) ==
 				    0) {
 					data->outputPtr = data->outputBuffer;
 					clearOutputBuffer(cb);
-					data->currentFrame = i;
+					data->currentFrame = j;
 				} else
 					dc->seekError = 1;
 				data->muteFrame = 0;