summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2016-10-30 08:36:13 -0700
committerMark Adler <madler@alumni.caltech.edu>2016-10-30 08:49:01 -0700
commit03614c56ad299f9b238c75aa1e66f0c08fc4fc8b (patch)
tree6cb5d2059fe21c342cb10a2b25e0ce000c33c96a
parent94575859cf7f657f0f31aff4c50761fe3f182699 (diff)
downloadzlib-03614c56ad299f9b238c75aa1e66f0c08fc4fc8b.tar.gz
zlib-03614c56ad299f9b238c75aa1e66f0c08fc4fc8b.tar.bz2
zlib-03614c56ad299f9b238c75aa1e66f0c08fc4fc8b.zip
Fix some typos.
-rw-r--r--ChangeLog4
-rw-r--r--contrib/ada/zlib-streams.ads6
-rw-r--r--contrib/ada/zlib-thin.ads2
-rw-r--r--contrib/minizip/unzip.c2
-rw-r--r--contrib/minizip/zip.c22
-rw-r--r--contrib/puff/puff.c2
-rw-r--r--deflate.c12
-rw-r--r--examples/gun.c2
-rw-r--r--examples/zran.c2
-rw-r--r--zlib.h4
10 files changed, 29 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f448fe..ad9a55e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -197,7 +197,7 @@ Changes in 1.2.5.2 (17 Dec 2011)
197- Add a transparent write mode to gzopen() when 'T' is in the mode 197- Add a transparent write mode to gzopen() when 'T' is in the mode
198- Update python link in zlib man page 198- Update python link in zlib man page
199- Get inffixed.h and MAKEFIXED result to match 199- Get inffixed.h and MAKEFIXED result to match
200- Add a ./config --solo option to make zlib subset with no libary use 200- Add a ./config --solo option to make zlib subset with no library use
201- Add undocumented inflateResetKeep() function for CAB file decoding 201- Add undocumented inflateResetKeep() function for CAB file decoding
202- Add --cover option to ./configure for gcc coverage testing 202- Add --cover option to ./configure for gcc coverage testing
203- Add #define ZLIB_CONST option to use const in the z_stream interface 203- Add #define ZLIB_CONST option to use const in the z_stream interface
@@ -1270,7 +1270,7 @@ Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
1270- fix array overlay in deflate.c which sometimes caused bad compressed data 1270- fix array overlay in deflate.c which sometimes caused bad compressed data
1271- fix inflate bug with empty stored block 1271- fix inflate bug with empty stored block
1272- fix MSDOS medium model which was broken in 0.99 1272- fix MSDOS medium model which was broken in 0.99
1273- fix deflateParams() which could generated bad compressed data. 1273- fix deflateParams() which could generate bad compressed data.
1274- Bytef is define'd instead of typedef'ed (work around Borland bug) 1274- Bytef is define'd instead of typedef'ed (work around Borland bug)
1275- added an INDEX file 1275- added an INDEX file
1276- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32), 1276- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
diff --git a/contrib/ada/zlib-streams.ads b/contrib/ada/zlib-streams.ads
index f0193c6..8e26cd4 100644
--- a/contrib/ada/zlib-streams.ads
+++ b/contrib/ada/zlib-streams.ads
@@ -31,7 +31,7 @@ package ZLib.Streams is
31 Mode : in Flush_Mode := Sync_Flush); 31 Mode : in Flush_Mode := Sync_Flush);
32 -- Flush the written data to the back stream, 32 -- Flush the written data to the back stream,
33 -- all data placed to the compressor is flushing to the Back stream. 33 -- all data placed to the compressor is flushing to the Back stream.
34 -- Should not be used untill necessary, becouse it is decreasing 34 -- Should not be used until necessary, because it is decreasing
35 -- compression. 35 -- compression.
36 36
37 function Read_Total_In (Stream : in Stream_Type) return Count; 37 function Read_Total_In (Stream : in Stream_Type) return Count;
@@ -97,13 +97,13 @@ private
97 Rest_Last : Stream_Element_Offset; 97 Rest_Last : Stream_Element_Offset;
98 -- Buffer for Read operation. 98 -- Buffer for Read operation.
99 -- We need to have this buffer in the record 99 -- We need to have this buffer in the record
100 -- becouse not all read data from back stream 100 -- because not all read data from back stream
101 -- could be processed during the read operation. 101 -- could be processed during the read operation.
102 102
103 Buffer_Size : Stream_Element_Offset; 103 Buffer_Size : Stream_Element_Offset;
104 -- Buffer size for write operation. 104 -- Buffer size for write operation.
105 -- We do not need to have this buffer 105 -- We do not need to have this buffer
106 -- in the record becouse all data could be 106 -- in the record because all data could be
107 -- processed in the write operation. 107 -- processed in the write operation.
108 108
109 Back : Stream_Access; 109 Back : Stream_Access;
diff --git a/contrib/ada/zlib-thin.ads b/contrib/ada/zlib-thin.ads
index d4407eb..810173c 100644
--- a/contrib/ada/zlib-thin.ads
+++ b/contrib/ada/zlib-thin.ads
@@ -436,7 +436,7 @@ private
436 436
437 pragma Import (C, inflateBackInit, "inflateBackInit_"); 437 pragma Import (C, inflateBackInit, "inflateBackInit_");
438 438
439 -- I stopped binding the inflateBack routines, becouse realize that 439 -- I stopped binding the inflateBack routines, because realize that
440 -- it does not support zlib and gzip headers for now, and have no 440 -- it does not support zlib and gzip headers for now, and have no
441 -- symmetric deflateBack routines. 441 -- symmetric deflateBack routines.
442 -- ZLib-Ada is symmetric regarding deflate/inflate data transformation 442 -- ZLib-Ada is symmetric regarding deflate/inflate data transformation
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index 9093504..bcfb941 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -200,7 +200,7 @@ typedef struct
200/* =========================================================================== 200/* ===========================================================================
201 Read a byte from a gz_stream; update next_in and avail_in. Return EOF 201 Read a byte from a gz_stream; update next_in and avail_in. Return EOF
202 for end of file. 202 for end of file.
203 IN assertion: the stream s has been sucessfully opened for reading. 203 IN assertion: the stream s has been successfully opened for reading.
204*/ 204*/
205 205
206 206
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index ea54853..44e88a9 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -15,7 +15,7 @@
15 Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions. 15 Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
16 Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data 16 Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
17 It is used when recreting zip archive with RAW when deleting items from a zip. 17 It is used when recreting zip archive with RAW when deleting items from a zip.
18 ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed. 18 ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed.
19 Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required) 19 Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
20 Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer 20 Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
21 21
@@ -116,7 +116,7 @@ typedef struct linkedlist_datablock_internal_s
116 struct linkedlist_datablock_internal_s* next_datablock; 116 struct linkedlist_datablock_internal_s* next_datablock;
117 uLong avail_in_this_block; 117 uLong avail_in_this_block;
118 uLong filled_in_this_block; 118 uLong filled_in_this_block;
119 uLong unused; /* for future use and alignement */ 119 uLong unused; /* for future use and alignment */
120 unsigned char data[SIZEDATA_INDATABLOCK]; 120 unsigned char data[SIZEDATA_INDATABLOCK];
121} linkedlist_datablock_internal; 121} linkedlist_datablock_internal;
122 122
@@ -171,7 +171,7 @@ typedef struct
171 curfile64_info ci; /* info on the file curretly writing */ 171 curfile64_info ci; /* info on the file curretly writing */
172 172
173 ZPOS64_T begin_pos; /* position of the beginning of the zipfile */ 173 ZPOS64_T begin_pos; /* position of the beginning of the zipfile */
174 ZPOS64_T add_position_when_writting_offset; 174 ZPOS64_T add_position_when_writing_offset;
175 ZPOS64_T number_entry; 175 ZPOS64_T number_entry;
176 176
177#ifndef NO_ADDFILEINEXISTINGZIP 177#ifndef NO_ADDFILEINEXISTINGZIP
@@ -807,7 +807,7 @@ int LoadCentralDirectoryRecord(zip64_internal* pziinit)
807 } 807 }
808 808
809 byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir); 809 byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
810 pziinit->add_position_when_writting_offset = byte_before_the_zipfile; 810 pziinit->add_position_when_writing_offset = byte_before_the_zipfile;
811 811
812 { 812 {
813 ZPOS64_T size_central_dir_to_read = size_central_dir; 813 ZPOS64_T size_central_dir_to_read = size_central_dir;
@@ -875,7 +875,7 @@ extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* gl
875 ziinit.in_opened_file_inzip = 0; 875 ziinit.in_opened_file_inzip = 0;
876 ziinit.ci.stream_initialised = 0; 876 ziinit.ci.stream_initialised = 0;
877 ziinit.number_entry = 0; 877 ziinit.number_entry = 0;
878 ziinit.add_position_when_writting_offset = 0; 878 ziinit.add_position_when_writing_offset = 0;
879 init_linkedlist(&(ziinit.central_dir)); 879 init_linkedlist(&(ziinit.central_dir));
880 880
881 881
@@ -1164,7 +1164,7 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
1164 if(zi->ci.pos_local_header >= 0xffffffff) 1164 if(zi->ci.pos_local_header >= 0xffffffff)
1165 zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4); 1165 zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
1166 else 1166 else
1167 zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4); 1167 zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writing_offset,4);
1168 1168
1169 for (i=0;i<size_filename;i++) 1169 for (i=0;i<size_filename;i++)
1170 *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i); 1170 *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
@@ -1755,7 +1755,7 @@ extern int ZEXPORT zipCloseFileInZip (zipFile file)
1755int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip) 1755int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
1756{ 1756{
1757 int err = ZIP_OK; 1757 int err = ZIP_OK;
1758 ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset; 1758 ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writing_offset;
1759 1759
1760 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4); 1760 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
1761 1761
@@ -1808,7 +1808,7 @@ int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centra
1808 1808
1809 if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */ 1809 if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
1810 { 1810 {
1811 ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset; 1811 ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
1812 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8); 1812 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
1813 } 1813 }
1814 return err; 1814 return err;
@@ -1849,13 +1849,13 @@ int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir,
1849 1849
1850 if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */ 1850 if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
1851 { 1851 {
1852 ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset; 1852 ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
1853 if(pos >= 0xffffffff) 1853 if(pos >= 0xffffffff)
1854 { 1854 {
1855 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4); 1855 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
1856 } 1856 }
1857 else 1857 else
1858 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4); 1858 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writing_offset),4);
1859 } 1859 }
1860 1860
1861 return err; 1861 return err;
@@ -1921,7 +1921,7 @@ extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
1921 } 1921 }
1922 free_linkedlist(&(zi->central_dir)); 1922 free_linkedlist(&(zi->central_dir));
1923 1923
1924 pos = centraldir_pos_inzip - zi->add_position_when_writting_offset; 1924 pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
1925 if(pos >= 0xffffffff || zi->number_entry > 0xFFFF) 1925 if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
1926 { 1926 {
1927 ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream); 1927 ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
diff --git a/contrib/puff/puff.c b/contrib/puff/puff.c
index ba58483..c6c90d7 100644
--- a/contrib/puff/puff.c
+++ b/contrib/puff/puff.c
@@ -17,7 +17,7 @@
17 * All dynamically allocated memory comes from the stack. The stack required 17 * All dynamically allocated memory comes from the stack. The stack required
18 * is less than 2K bytes. This code is compatible with 16-bit int's and 18 * is less than 2K bytes. This code is compatible with 16-bit int's and
19 * assumes that long's are at least 32 bits. puff.c uses the short data type, 19 * assumes that long's are at least 32 bits. puff.c uses the short data type,
20 * assumed to be 16 bits, for arrays in order to to conserve memory. The code 20 * assumed to be 16 bits, for arrays in order to conserve memory. The code
21 * works whether integers are stored big endian or little endian. 21 * works whether integers are stored big endian or little endian.
22 * 22 *
23 * In the comments below are "Format notes" that describe the inflate process 23 * In the comments below are "Format notes" that describe the inflate process
diff --git a/deflate.c b/deflate.c
index 85e30bc..c71c3f5 100644
--- a/deflate.c
+++ b/deflate.c
@@ -154,9 +154,9 @@ local const config configuration_table[10] = {
154 154
155/* =========================================================================== 155/* ===========================================================================
156 * Update a hash value with the given input byte 156 * Update a hash value with the given input byte
157 * IN assertion: all calls to to UPDATE_HASH are made with consecutive 157 * IN assertion: all calls to UPDATE_HASH are made with consecutive input
158 * input characters, so that a running hash key can be computed from the 158 * characters, so that a running hash key can be computed from the previous
159 * previous key instead of complete recalculation each time. 159 * key instead of complete recalculation each time.
160 */ 160 */
161#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask) 161#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
162 162
@@ -167,9 +167,9 @@ local const config configuration_table[10] = {
167 * the previous length of the hash chain. 167 * the previous length of the hash chain.
168 * If this file is compiled with -DFASTEST, the compression level is forced 168 * If this file is compiled with -DFASTEST, the compression level is forced
169 * to 1, and no hash chains are maintained. 169 * to 1, and no hash chains are maintained.
170 * IN assertion: all calls to to INSERT_STRING are made with consecutive 170 * IN assertion: all calls to INSERT_STRING are made with consecutive input
171 * input characters and the first MIN_MATCH bytes of str are valid 171 * characters and the first MIN_MATCH bytes of str are valid (except for
172 * (except for the last MIN_MATCH-1 bytes of the input file). 172 * the last MIN_MATCH-1 bytes of the input file).
173 */ 173 */
174#ifdef FASTEST 174#ifdef FASTEST
175#define INSERT_STRING(s, str, match_head) \ 175#define INSERT_STRING(s, str, match_head) \
diff --git a/examples/gun.c b/examples/gun.c
index 89e484f..be44fa5 100644
--- a/examples/gun.c
+++ b/examples/gun.c
@@ -46,7 +46,7 @@
46 end-of-file, they cannot be concantenated. If a Unix compress stream is 46 end-of-file, they cannot be concantenated. If a Unix compress stream is
47 encountered in an input file, it is the last stream in that file. 47 encountered in an input file, it is the last stream in that file.
48 48
49 Like gunzip and uncompress, the file attributes of the orignal compressed 49 Like gunzip and uncompress, the file attributes of the original compressed
50 file are maintained in the final uncompressed file, to the extent that the 50 file are maintained in the final uncompressed file, to the extent that the
51 user permissions allow it. 51 user permissions allow it.
52 52
diff --git a/examples/zran.c b/examples/zran.c
index 278f9ad..4fec659 100644
--- a/examples/zran.c
+++ b/examples/zran.c
@@ -27,7 +27,7 @@
27 grows as needed to accommodate the points. 27 grows as needed to accommodate the points.
28 28
29 To use the index, an offset in the uncompressed data is provided, for which 29 To use the index, an offset in the uncompressed data is provided, for which
30 the latest accees point at or preceding that offset is located in the index. 30 the latest access point at or preceding that offset is located in the index.
31 The input file is positioned to the specified location in the index, and if 31 The input file is positioned to the specified location in the index, and if
32 necessary the first few bits of the compressed data is read from the file. 32 necessary the first few bits of the compressed data is read from the file.
33 inflate is initialized with those bits and the 32K of uncompressed data, and 33 inflate is initialized with those bits and the 32K of uncompressed data, and
diff --git a/zlib.h b/zlib.h
index f6b4894..fc969af 100644
--- a/zlib.h
+++ b/zlib.h
@@ -487,7 +487,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
487 instead use raw inflate, see inflateInit2() below, or inflateBack() and 487 instead use raw inflate, see inflateInit2() below, or inflateBack() and
488 perform their own processing of the gzip header and trailer. When processing 488 perform their own processing of the gzip header and trailer. When processing
489 gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output 489 gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
490 producted so far. The CRC-32 is checked against the gzip trailer. 490 produced so far. The CRC-32 is checked against the gzip trailer.
491 491
492 inflate() returns Z_OK if some progress has been made (more input processed 492 inflate() returns Z_OK if some progress has been made (more input processed
493 or more output produced), Z_STREAM_END if the end of the compressed data has 493 or more output produced), Z_STREAM_END if the end of the compressed data has
@@ -1444,7 +1444,7 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
1444 If the flush parameter is Z_FINISH, the remaining data is written and the 1444 If the flush parameter is Z_FINISH, the remaining data is written and the
1445 gzip stream is completed in the output. If gzwrite() is called again, a new 1445 gzip stream is completed in the output. If gzwrite() is called again, a new
1446 gzip stream will be started in the output. gzread() is able to read such 1446 gzip stream will be started in the output. gzread() is able to read such
1447 concatented gzip streams. 1447 concatenated gzip streams.
1448 1448
1449 gzflush should be called only when strictly necessary because it will 1449 gzflush should be called only when strictly necessary because it will
1450 degrade compression if called too often. 1450 degrade compression if called too often.