Make code -Wshadow warning free.

This commit is contained in:
Markus F.X.J. Oberhumer
2006-06-11 12:25:19 +02:00
parent d461b53235
commit c34daf1a35
4 changed files with 23 additions and 24 deletions
+4 -4
View File
@@ -1433,16 +1433,16 @@ static bool match(unsigned itype, const unsigned char *ntype,
struct helper
{
static bool match(unsigned num, const unsigned char *unistr,
const char *keep)
const char *mkeep)
{
if (!unistr)
return (unsigned) atoi(keep) == num;
return (unsigned) atoi(mkeep) == num;
unsigned ic;
for (ic = 0; ic < get_le16(unistr); ic++)
if (unistr[2 + ic * 2] != (unsigned char) keep[ic])
if (unistr[2 + ic * 2] != (unsigned char) mkeep[ic])
return false;
return keep[ic] == 0 || keep[ic] == ',' || keep[ic] == '/';
return mkeep[ic] == 0 || mkeep[ic] == ',' || mkeep[ic] == '/';
};
};