diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 10:52:57 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 10:52:57 (GMT) |
| commit | e371ad65f317c7bcf3355111ca08652254798f82 (patch) | |
| tree | 2f879275ab316e7201336e37400fa20baa79f757 /Modules | |
| parent | b88ed1549e76fadf161227d15cc307f0e8b94c59 (diff) | |
| parent | 2e8a07c21d66235b79dc2e41b447d6492eee16bf (diff) | |
| download | cpython-e371ad65f317c7bcf3355111ca08652254798f82.zip cpython-e371ad65f317c7bcf3355111ca08652254798f82.tar.gz cpython-e371ad65f317c7bcf3355111ca08652254798f82.tar.bz2 | |
Merge with 3.2.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/zlib/deflate.h | 2 | ||||
| -rw-r--r-- | Modules/zlib/gzio.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/zlib/deflate.h b/Modules/zlib/deflate.h index 442e14a..cbf0d1e 100644 --- a/Modules/zlib/deflate.h +++ b/Modules/zlib/deflate.h @@ -188,7 +188,7 @@ typedef struct internal_state { int nice_match; /* Stop searching when current match exceeds this */ /* used by trees.c: */ - /* Didn't use ct_data typedef below to suppress compiler warning */ + /* Didn't use ct_data typedef below to supress compiler warning */ struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ diff --git a/Modules/zlib/gzio.c b/Modules/zlib/gzio.c index 5cf50e0..7e90f49 100644 --- a/Modules/zlib/gzio.c +++ b/Modules/zlib/gzio.c @@ -256,7 +256,7 @@ int ZEXPORT gzsetparams (file, level, strategy) /* =========================================================================== Read a byte from a gz_stream; update next_in and avail_in. Return EOF for end of file. - IN assertion: the stream s has been successfully opened for reading. + IN assertion: the stream s has been sucessfully opened for reading. */ local int get_byte(s) gz_stream *s; @@ -281,7 +281,7 @@ local int get_byte(s) mode to transparent if the gzip magic header is not present; set s->err to Z_DATA_ERROR if the magic header is present but the rest of the header is incorrect. - IN assertion: the stream s has already been created successfully; + IN assertion: the stream s has already been created sucessfully; s->stream.avail_in is zero for the first time, but may be non-zero for concatenated .gz files. */ |