ambiguous global count variable renamed.

diff --git a/archivers/lha/dhuf.cpp b/archivers/lha/dhuf.cpp
index 0f215a79b514bae9714a1f9f1c41445864716d5a..d87c007425b5e46eaa2905763a94b051f367a88d 100644 (file)
--- 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 6e41db14acd4f62cf1dde20450b774bdf4ce690a..c16b1a5b81d387da48089ca3cae1421441a32490 100644 (file)
--- 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 71af62be39f97e4f8b811c5d66cc5b506694b2d4..8f08035a02b9d387393a38617fbf9ebf2fc0915d 100644 (file)
--- 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];