From: Toni Wilen <twilen@winuae.net>
Date: Thu, 16 Aug 2012 17:28:51 +0000 (+0300)
Subject: ambiguous global count variable renamed.
X-Git-Tag: 2500~19
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=bdcf870e763ccf5573144db0ad8bfa80adcf9bda;p=francis%2Fwinuae.git

ambiguous global count variable renamed.
---

diff --git a/archivers/lha/dhuf.cpp b/archivers/lha/dhuf.cpp
index 0f215a79..d87c0074 100644
--- a/archivers/lha/dhuf.cpp
+++ b/archivers/lha/dhuf.cpp
@@ -295,7 +295,7 @@ decode_p_dyn(void)
 	int             c;
 	short           buf, cnt;
 
-	while (count > nextcount) {
+	while (lhcount > nextcount) {
 		make_new_node(nextcount / 64);
 		if ((nextcount += 64) >= nn)
 			nextcount = 0xffffffff;
diff --git a/archivers/lha/lha.h b/archivers/lha/lha.h
index 6e41db14..c16b1a5b 100644
--- a/archivers/lha/lha.h
+++ b/archivers/lha/lha.h
@@ -166,7 +166,7 @@ EXTERN int      unpackable;
 EXTERN unsigned long origsize, compsize;
 EXTERN unsigned short dicbit;
 EXTERN unsigned short maxmatch;
-EXTERN unsigned long count;
+EXTERN unsigned long lhcount;
 EXTERN unsigned long loc;			/* short -> long .. Changed N.Watazaki */
 EXTERN unsigned char *text;
 EXTERN int		prev_char;
diff --git a/archivers/lha/slide.cpp b/archivers/lha/slide.cpp
index 71af62be..8f08035a 100644
--- a/archivers/lha/slide.cpp
+++ b/archivers/lha/slide.cpp
@@ -407,9 +407,9 @@ int decode(struct interfacing *lhinterface)
 	decode_set.decode_start();
 	dicsiz1 = dicsiz - 1;
 	offset = (lhinterface->method == LARC_METHOD_NUM) ? 0x100 - 2 : 0x100 - 3;
-	count = 0;
+	lhcount = 0;
 	loc = 0;
-	while (count < origsize) {
+	while (lhcount < origsize) {
 		c = decode_set.decode_c();
 		if (c <= UCHAR_MAX) {
 #ifdef DEBUG
@@ -420,7 +420,7 @@ int decode(struct interfacing *lhinterface)
 				fwrite_crc(dtext, dicsiz, outfile);
 				loc = 0;
 			}
-			count++;
+			lhcount++;
 		}
 		else {
 			j = c - offset;
@@ -428,7 +428,7 @@ int decode(struct interfacing *lhinterface)
 #ifdef DEBUG
 			fprintf(fout, "%u M %u %u ", count, (loc-1-i) & dicsiz1, j);
 #endif
-			count += j;
+			lhcount += j;
 			for (k = 0; k < j; k++) {
 				c = dtext[(i + k) & dicsiz1];