summaryrefslogtreecommitdiff
path: root/inflate.c
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-01-29 17:44:04 -0800
committerMark Adler <madler@alumni.caltech.edu>2012-01-29 21:15:24 -0800
commit5dac2aa00710d4fee921cf492dd4b7fd2e27c238 (patch)
treef601c76c1f83144a9810ed6e7136c58e5378c49d /inflate.c
parent7b3f71ba5fc29f3743fae9b9dbe071018a6b6b4e (diff)
downloadzlib-5dac2aa00710d4fee921cf492dd4b7fd2e27c238.tar.gz
Avoid the use of the Objective-C reserved name "id".
Diffstat (limited to 'inflate.c')
-rw-r--r--inflate.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/inflate.c b/inflate.c
index cc89517..0885c1d 100644
--- a/inflate.c
+++ b/inflate.c
@@ -1275,7 +1275,7 @@ const Bytef *dictionary;
uInt dictLength;
{
struct inflate_state FAR *state;
- unsigned long id;
+ unsigned long dictid;
unsigned char *next;
unsigned avail;
int ret;
@@ -1286,11 +1286,11 @@ uInt dictLength;
if (state->wrap != 0 && state->mode != DICT)
return Z_STREAM_ERROR;
- /* check for correct dictionary id */
+ /* check for correct dictionary identifier */
if (state->mode == DICT) {
- id = adler32(0L, Z_NULL, 0);
- id = adler32(id, dictionary, dictLength);
- if (id != state->check)
+ dictid = adler32(0L, Z_NULL, 0);
+ dictid = adler32(dictid, dictionary, dictLength);
+ if (dictid != state->check)
return Z_DATA_ERROR;
}