summaryrefslogtreecommitdiff
path: root/lib/zlib/contrib/minizip
diff options
context:
space:
mode:
Diffstat (limited to 'lib/zlib/contrib/minizip')
-rw-r--r--lib/zlib/contrib/minizip/miniunz.c2
-rw-r--r--lib/zlib/contrib/minizip/minizip.c4
-rw-r--r--lib/zlib/contrib/minizip/unzip.c8
-rw-r--r--lib/zlib/contrib/minizip/unzip.h6
-rw-r--r--lib/zlib/contrib/minizip/zip.c6
5 files changed, 13 insertions, 13 deletions
diff --git a/lib/zlib/contrib/minizip/miniunz.c b/lib/zlib/contrib/minizip/miniunz.c
index f599938884..cf9a03b050 100644
--- a/lib/zlib/contrib/minizip/miniunz.c
+++ b/lib/zlib/contrib/minizip/miniunz.c
@@ -536,7 +536,7 @@ int main(argc,argv)
# endif
strncpy(filename_try, zipfilename,MAXFILENAME-1);
- /* strncpy doesnt append the trailing NULL, of the string is too long. */
+ /* strncpy doesn't append the trailing NULL, if the string is too long. */
filename_try[ MAXFILENAME ] = '\0';
# ifdef USEWIN32IOAPI
diff --git a/lib/zlib/contrib/minizip/minizip.c b/lib/zlib/contrib/minizip/minizip.c
index f2dfecd8b1..2aae64c0a0 100644
--- a/lib/zlib/contrib/minizip/minizip.c
+++ b/lib/zlib/contrib/minizip/minizip.c
@@ -77,7 +77,7 @@ uLong filetime(f, tmzip, dt)
len = MAXFILENAME;
strncpy(name, f,MAXFILENAME-1);
- /* strncpy doesnt append the trailing NULL, of the string is too long. */
+ /* strncpy doesn't append the trailing NULL, if the string is too long. */
name[ MAXFILENAME ] = '\0';
if (name[len - 1] == '/')
@@ -253,7 +253,7 @@ int main(argc,argv)
zipok = 1 ;
strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
- /* strncpy doesnt append the trailing NULL, of the string is too long. */
+ /* strncpy doesn't append the trailing NULL, if the string is too long. */
filename_try[ MAXFILENAME ] = '\0';
len=(int)strlen(filename_try);
diff --git a/lib/zlib/contrib/minizip/unzip.c b/lib/zlib/contrib/minizip/unzip.c
index 9ad4766d8d..fe2f1f0a96 100644
--- a/lib/zlib/contrib/minizip/unzip.c
+++ b/lib/zlib/contrib/minizip/unzip.c
@@ -159,7 +159,7 @@ typedef struct
/* ===========================================================================
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 sucessfully opened for reading.
+ IN assertion: the stream s has been successfully opened for reading.
*/
@@ -295,10 +295,10 @@ local int strcmpcasenosensitive_internal (fileName1,fileName2)
/*
Compare two filename (fileName1,fileName2).
- If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
- If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+ If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
+ If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
or strcasecmp)
- If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+ If iCaseSensitivity = 0, case sensitivity is default of your operating system
(like 1 on Unix, 2 on Windows)
*/
diff --git a/lib/zlib/contrib/minizip/unzip.h b/lib/zlib/contrib/minizip/unzip.h
index b247937c80..6a7e155d66 100644
--- a/lib/zlib/contrib/minizip/unzip.h
+++ b/lib/zlib/contrib/minizip/unzip.h
@@ -124,10 +124,10 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
int iCaseSensitivity));
/*
Compare two filename (fileName1,fileName2).
- If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
- If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+ If iCaseSensitivity = 1, comparison is case sensitive (like strcmp)
+ If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi
or strcasecmp)
- If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+ If iCaseSensitivity = 0, case sensitivity is default of your operating system
(like 1 on Unix, 2 on Windows)
*/
diff --git a/lib/zlib/contrib/minizip/zip.c b/lib/zlib/contrib/minizip/zip.c
index 7fbe002743..bb678ee133 100644
--- a/lib/zlib/contrib/minizip/zip.c
+++ b/lib/zlib/contrib/minizip/zip.c
@@ -99,7 +99,7 @@ typedef struct linkedlist_datablock_internal_s
struct linkedlist_datablock_internal_s* next_datablock;
uLong avail_in_this_block;
uLong filled_in_this_block;
- uLong unused; /* for future use and alignement */
+ uLong unused; /* for future use and alignment */
unsigned char data[SIZEDATA_INDATABLOCK];
} linkedlist_datablock_internal;
@@ -117,12 +117,12 @@ typedef struct
uInt pos_in_buffered_data; /* last written byte in buffered_data */
uLong pos_local_header; /* offset of the local header of the file
- currenty writing */
+ currently writing */
char* central_header; /* central header data for the current file */
uLong size_centralheader; /* size of the central header for cur file */
uLong flag; /* flag of the file currently writing */
- int method; /* compression method of file currenty wr.*/
+ int method; /* compression method of file currently wr.*/
int raw; /* 1 for directly writing raw data */
Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
uLong dosDate;