diff options
| -rw-r--r-- | archival/gunzip.c | 8 | ||||
| -rw-r--r-- | archival/gzip.c | 6 | ||||
| -rw-r--r-- | gunzip.c | 8 | ||||
| -rw-r--r-- | gzip.c | 6 | ||||
| -rw-r--r-- | nfsmount.c | 10 | ||||
| -rw-r--r-- | util-linux/nfsmount.c | 10 |
6 files changed, 24 insertions, 24 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c index 8100003ec..5c97fac07 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 6c058d2b6..6369b894a 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 */ @@ -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; } } @@ -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 */ diff --git a/nfsmount.c b/nfsmount.c index 6643ed5aa..a62df3272 100644 --- a/nfsmount.c +++ b/nfsmount.c @@ -735,20 +735,20 @@ int nfsmount(const char *spec, const char *node, int *flags, #endif } else { #if NFS_MOUNT_VERSION >= 4 - fhandle3 *fhandle; + fhandle3 *my_fhandle; if (status.nfsv3.fhs_status != 0) { error_msg("%s:%s failed, reason given by server: %s", hostname, dirname, nfs_strerror(status.nfsv3.fhs_status)); goto fail; } - fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle; + my_fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle; memset(data.old_root.data, 0, NFS_FHSIZE); memset(&data.root, 0, sizeof(data.root)); - data.root.size = fhandle->fhandle3_len; + data.root.size = my_fhandle->fhandle3_len; memcpy(data.root.data, - (char *) fhandle->fhandle3_val, - fhandle->fhandle3_len); + (char *) my_fhandle->fhandle3_val, + my_fhandle->fhandle3_len); data.flags |= NFS_MOUNT_VER3; #endif diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c index 6643ed5aa..a62df3272 100644 --- a/util-linux/nfsmount.c +++ b/util-linux/nfsmount.c @@ -735,20 +735,20 @@ int nfsmount(const char *spec, const char *node, int *flags, #endif } else { #if NFS_MOUNT_VERSION >= 4 - fhandle3 *fhandle; + fhandle3 *my_fhandle; if (status.nfsv3.fhs_status != 0) { error_msg("%s:%s failed, reason given by server: %s", hostname, dirname, nfs_strerror(status.nfsv3.fhs_status)); goto fail; } - fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle; + my_fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle; memset(data.old_root.data, 0, NFS_FHSIZE); memset(&data.root, 0, sizeof(data.root)); - data.root.size = fhandle->fhandle3_len; + data.root.size = my_fhandle->fhandle3_len; memcpy(data.root.data, - (char *) fhandle->fhandle3_val, - fhandle->fhandle3_len); + (char *) my_fhandle->fhandle3_val, + my_fhandle->fhandle3_len); data.flags |= NFS_MOUNT_VER3; #endif |