Remove shadowed local variables.

2 files changed, 10 insertions, 10 deletions

diff --git a/fitz/base_hash.c b/fitz/base_hash.c
index 9f96b75d..a1c46a7d 100644
--- a/fitz/base_hash.c
+++ b/fitz/base_hash.c
@@ -30,18 +30,18 @@ struct fz_hashtable_s
 
 static unsigned hash(unsigned char *s, int len)
 {
-	unsigned hash = 0;
+	unsigned val = 0;
 	int i;
 	for (i = 0; i < len; i++)
 	{
-		hash += s[i];
-		hash += (hash << 10);
-		hash ^= (hash >> 6);
+		val += s[i];
+		val += (val << 10);
+		val ^= (val >> 6);
 	}
-	hash += (hash << 3);
-	hash ^= (hash >> 11);
-	hash += (hash << 15);
-	return hash;
+	val += (val << 3);
+	val ^= (val >> 11);
+	val += (val << 15);
+	return val;
 }
 
 fz_hashtable *
diff --git a/fitz/filt_jbig2d.c b/fitz/filt_jbig2d.c
index 100eba05..122d41ce 100644
--- a/fitz/filt_jbig2d.c
+++ b/fitz/filt_jbig2d.c
@@ -99,10 +99,10 @@ fz_processjbig2d(fz_filter *filter, fz_buffer *in, fz_buffer *out)
 
 			/* XXX memcpy(out->wp, d->page->data + d->idx, len); */
 			{
-				unsigned char * restrict in = &d->page->data[d->idx];
+				unsigned char * restrict p = &d->page->data[d->idx];
 				unsigned char * restrict o = out->wp;
 				for (i = 0; i < len; i++)
-					*o++ = 0xff ^ *in++;
+					*o++ = 0xff ^ *p++;
 			}
 
 			out->wp += len;