More merges from resolve-shadow warnings:

utils/
  codecs/
  and a change I missed from formats/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-07 15:16:48 +00:00
parent 8397209316
commit 6305009cfc
8 changed files with 107 additions and 108 deletions

View File

@@ -1008,7 +1008,7 @@ double double2db( double value)
return 6.0 * log( value / 32767) / log( 2);
}
void readawaysamples( FILE *in, size_t size)
void readawaysamples( FILE *input, size_t size)
{
short *buffer;
int samplesread, count;
@@ -1023,8 +1023,8 @@ void readawaysamples( FILE *in, size_t size)
else
count = size;
samplesread = fread( buffer, sizeof(*buffer), count, in);
if (ferror( in) != 0)
samplesread = fread( buffer, sizeof(*buffer), count, input);
if (ferror( input) != 0)
fatalperror("Error reading input file");
size -= samplesread;
}