diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2016-10-30 08:36:13 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2016-10-30 08:49:01 -0700 |
| commit | 03614c56ad299f9b238c75aa1e66f0c08fc4fc8b (patch) | |
| tree | 6cb5d2059fe21c342cb10a2b25e0ce000c33c96a /contrib | |
| parent | 94575859cf7f657f0f31aff4c50761fe3f182699 (diff) | |
| download | zlib-03614c56ad299f9b238c75aa1e66f0c08fc4fc8b.tar.gz zlib-03614c56ad299f9b238c75aa1e66f0c08fc4fc8b.tar.bz2 zlib-03614c56ad299f9b238c75aa1e66f0c08fc4fc8b.zip | |
Fix some typos.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ada/zlib-streams.ads | 6 | ||||
| -rw-r--r-- | contrib/ada/zlib-thin.ads | 2 | ||||
| -rw-r--r-- | contrib/minizip/unzip.c | 2 | ||||
| -rw-r--r-- | contrib/minizip/zip.c | 22 | ||||
| -rw-r--r-- | contrib/puff/puff.c | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/contrib/ada/zlib-streams.ads b/contrib/ada/zlib-streams.ads index f0193c6b..8e26cd45 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 d4407eb8..810173cf 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 90935043..bcfb9416 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 ea54853e..44e88a9c 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) | |||
| 1755 | int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip) | 1755 | int 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 ba58483d..c6c90d71 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 |
