summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorEric Andersen2001-03-21 21:52:25 +0000
committerEric Andersen2001-03-21 21:52:25 +0000
commit851895ab80341f80398b93c9ad4aa20fcf463730 (patch)
tree53abdf274e7255fef7cf3008fcd341f946fdadbe /archival
parent1ca20a77476fb69e2472080ef6ba23c8c0ad12ad (diff)
downloadbusybox-851895ab80341f80398b93c9ad4aa20fcf463730.zip
busybox-851895ab80341f80398b93c9ad4aa20fcf463730.tar.gz
Clean up more local vars which shadow globals
-Erik
Diffstat (limited to 'archival')
-rw-r--r--archival/gunzip.c8
-rw-r--r--archival/gzip.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c
index 8100003..5c97fac 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -370,7 +370,7 @@ unsigned n; /* number of bytes in s[] */
register ulg c; /* temporary variable */
static unsigned long crc_32_tab[256];
if (crc_table_empty) {
- unsigned long c; /* crc shift register */
+ unsigned long csr; /* crc shift register */
unsigned long e; /* polynomial exclusive-or pattern */
int i; /* counter for all possible eight bit values */
int k; /* byte being shifted into crc apparatus */
@@ -386,13 +386,13 @@ unsigned n; /* number of bytes in s[] */
/* Compute and print table of CRC's, five per line */
crc_32_tab[0] = 0x00000000L;
for (i = 1; i < 256; i++) {
- c = i;
+ csr = i;
/* The idea to initialize the register with the byte instead of
* zero was stolen from Haruhiko Okumura's ar002
*/
for (k = 8; k; k--)
- c = c & 1 ? (c >> 1) ^ e : c >> 1;
- crc_32_tab[i]=c;
+ csr = csr & 1 ? (csr >> 1) ^ e : csr >> 1;
+ crc_32_tab[i]=csr;
}
}
diff --git a/archival/gzip.c b/archival/gzip.c
index 6c058d2..6369b89 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -294,7 +294,7 @@ void lm_init (ush * flags);
ulg deflate (void);
/* in trees.c */
-void ct_init (ush * attr, int *method);
+void ct_init (ush * attr, int *methodp);
int ct_tally (int dist, int lc);
ulg flush_block (char *buf, ulg stored_len, int eof);
@@ -3299,7 +3299,7 @@ long header_bytes; /* number of bytes in gzip header */
int zip(in, out)
int in, out; /* input and output file descriptors */
{
- uch flags = 0; /* general purpose bit flags */
+ uch my_flags = 0; /* general purpose bit flags */
ush attr = 0; /* ascii/binary flag */
ush deflate_flags = 0; /* pkzip -es, -en or -ex equivalent */
@@ -3315,7 +3315,7 @@ int in, out; /* input and output file descriptors */
put_byte(GZIP_MAGIC[1]);
put_byte(DEFLATED); /* compression method */
- put_byte(flags); /* general flags */
+ put_byte(my_flags); /* general flags */
put_long(time_stamp);
/* Write deflated file to zip file */