diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-01-29 17:44:04 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-01-29 21:15:24 -0800 |
| commit | 5dac2aa00710d4fee921cf492dd4b7fd2e27c238 (patch) | |
| tree | f601c76c1f83144a9810ed6e7136c58e5378c49d | |
| parent | 7b3f71ba5fc29f3743fae9b9dbe071018a6b6b4e (diff) | |
| download | zlib-5dac2aa00710d4fee921cf492dd4b7fd2e27c238.tar.gz zlib-5dac2aa00710d4fee921cf492dd4b7fd2e27c238.tar.bz2 zlib-5dac2aa00710d4fee921cf492dd4b7fd2e27c238.zip | |
Avoid the use of the Objective-C reserved name "id".
| -rw-r--r-- | inflate.c | 10 |
1 files changed, 5 insertions, 5 deletions
| @@ -1275,7 +1275,7 @@ const Bytef *dictionary; | |||
| 1275 | uInt dictLength; | 1275 | uInt dictLength; |
| 1276 | { | 1276 | { |
| 1277 | struct inflate_state FAR *state; | 1277 | struct inflate_state FAR *state; |
| 1278 | unsigned long id; | 1278 | unsigned long dictid; |
| 1279 | unsigned char *next; | 1279 | unsigned char *next; |
| 1280 | unsigned avail; | 1280 | unsigned avail; |
| 1281 | int ret; | 1281 | int ret; |
| @@ -1286,11 +1286,11 @@ uInt dictLength; | |||
| 1286 | if (state->wrap != 0 && state->mode != DICT) | 1286 | if (state->wrap != 0 && state->mode != DICT) |
| 1287 | return Z_STREAM_ERROR; | 1287 | return Z_STREAM_ERROR; |
| 1288 | 1288 | ||
| 1289 | /* check for correct dictionary id */ | 1289 | /* check for correct dictionary identifier */ |
| 1290 | if (state->mode == DICT) { | 1290 | if (state->mode == DICT) { |
| 1291 | id = adler32(0L, Z_NULL, 0); | 1291 | dictid = adler32(0L, Z_NULL, 0); |
| 1292 | id = adler32(id, dictionary, dictLength); | 1292 | dictid = adler32(dictid, dictionary, dictLength); |
| 1293 | if (id != state->check) | 1293 | if (dictid != state->check) |
| 1294 | return Z_DATA_ERROR; | 1294 | return Z_DATA_ERROR; |
| 1295 | } | 1295 | } |
| 1296 | 1296 | ||