Don't shadow names

This commit is contained in:
Matthew Barr
2016-07-25 15:33:40 +10:00
parent 68ae4cc7c8
commit cbd115f7fe
12 changed files with 70 additions and 71 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Intel Corporation
* Copyright (c) 2015-2016, Intel Corporation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -1447,12 +1447,12 @@ unichar readUtf8CodePoint4c(const u8 *ts) {
// Otherwise, we interpret the first three digits as an
// octal escape, and the remaining characters stand for
// themselves as literals.
const u8 *p = ts;
const u8 *s = ts;
unsigned int accum = 0;
unsigned int oct_digits = 0;
assert(*p == '\\'); // token starts at backslash
for (++p; p < te && oct_digits < 3; ++oct_digits, ++p) {
u8 digit = *p - '0';
assert(*s == '\\'); // token starts at backslash
for (++s; s < te && oct_digits < 3; ++oct_digits, ++s) {
u8 digit = *s - '0';
if (digit < 8) {
accum = digit + accum * 8;
} else {
@@ -1465,8 +1465,8 @@ unichar readUtf8CodePoint4c(const u8 *ts) {
}
// And then the rest of the digits, if any, are literal.
for (; p < te; ++p) {
addLiteral(currentSeq, *p, mode);
for (; s < te; ++s) {
addLiteral(currentSeq, *s, mode);
}
}
};