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/minizip | |
parent | 94575859cf7f657f0f31aff4c50761fe3f182699 (diff) | |
download | zlib-03614c56ad299f9b238c75aa1e66f0c08fc4fc8b.tar.gz zlib-03614c56ad299f9b238c75aa1e66f0c08fc4fc8b.tar.bz2 zlib-03614c56ad299f9b238c75aa1e66f0c08fc4fc8b.zip |
Fix some typos.
Diffstat (limited to 'contrib/minizip')
-rw-r--r-- | contrib/minizip/unzip.c | 2 | ||||
-rw-r--r-- | contrib/minizip/zip.c | 22 |
2 files changed, 12 insertions, 12 deletions
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) | |||
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); |