summaryrefslogtreecommitdiff
path: root/lib/zlib
diff options
context:
space:
mode:
Diffstat (limited to 'lib/zlib')
-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
-rw-r--r--lib/zlib/contrib/puff/puff.c2
-rw-r--r--lib/zlib/deflate.h2
-rw-r--r--lib/zlib/examples/fitblk.c2
-rw-r--r--lib/zlib/examples/gun.c2
-rw-r--r--lib/zlib/gzio.c4
-rw-r--r--lib/zlib/zlib.h2
11 files changed, 20 insertions, 20 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;
diff --git a/lib/zlib/contrib/puff/puff.c b/lib/zlib/contrib/puff/puff.c
index ce0cc405e3..1fbcc18f29 100644
--- a/lib/zlib/contrib/puff/puff.c
+++ b/lib/zlib/contrib/puff/puff.c
@@ -585,7 +585,7 @@ local int fixed(struct state *s)
* are themselves compressed using Huffman codes and run-length encoding. In
* the list of code lengths, a 0 symbol means no code, a 1..15 symbol means
* that length, and the symbols 16, 17, and 18 are run-length instructions.
- * Each of 16, 17, and 18 are follwed by extra bits to define the length of
+ * Each of 16, 17, and 18 are followed by extra bits to define the length of
* the run. 16 copies the last length 3 to 6 times. 17 represents 3 to 10
* zero lengths, and 18 represents 11 to 138 zero lengths. Unused symbols
* are common, hence the special coding for zero lengths.
diff --git a/lib/zlib/deflate.h b/lib/zlib/deflate.h
index 05a5ab3a2c..b16f7a7728 100644
--- a/lib/zlib/deflate.h
+++ b/lib/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 supress compiler warning */
+ /* Didn't use ct_data typedef below to suppress 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/lib/zlib/examples/fitblk.c b/lib/zlib/examples/fitblk.c
index c61de5c996..966702dea9 100644
--- a/lib/zlib/examples/fitblk.c
+++ b/lib/zlib/examples/fitblk.c
@@ -17,7 +17,7 @@
data in order to determine how much of that input will compress to
nearly the requested output block size. The first pass generates
enough deflate blocks to produce output to fill the requested
- output size plus a specfied excess amount (see the EXCESS define
+ output size plus a specified excess amount (see the EXCESS define
below). The last deflate block may go quite a bit past that, but
is discarded. The second pass decompresses and recompresses just
the compressed data that fit in the requested plus excess sized
diff --git a/lib/zlib/examples/gun.c b/lib/zlib/examples/gun.c
index bfec590a00..dce01aef0f 100644
--- a/lib/zlib/examples/gun.c
+++ b/lib/zlib/examples/gun.c
@@ -42,7 +42,7 @@
end-of-file, they cannot be concantenated. If a Unix compress stream is
encountered in an input file, it is the last stream in that file.
- Like gunzip and uncompress, the file attributes of the orignal compressed
+ Like gunzip and uncompress, the file attributes of the original compressed
file are maintained in the final uncompressed file, to the extent that the
user permissions allow it.
diff --git a/lib/zlib/gzio.c b/lib/zlib/gzio.c
index 0b51297936..55521a32ef 100644
--- a/lib/zlib/gzio.c
+++ b/lib/zlib/gzio.c
@@ -254,7 +254,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 sucessfully opened for reading.
+ IN assertion: the stream s has been successfully opened for reading.
*/
local int get_byte(s)
gz_stream *s;
@@ -279,7 +279,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 sucessfully;
+ IN assertion: the stream s has already been created successfully;
s->stream.avail_in is zero for the first time, but may be non-zero
for concatenated .gz files.
*/
diff --git a/lib/zlib/zlib.h b/lib/zlib/zlib.h
index a660031e94..aa7f0825f4 100644
--- a/lib/zlib/zlib.h
+++ b/lib/zlib/zlib.h
@@ -885,7 +885,7 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
See inflateBack() for the usage of these routines.
inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
- the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+ the parameters are invalid, Z_MEM_ERROR if the internal state could not
be allocated, or Z_VERSION_ERROR if the version of the library does not
match the version of the header file.
*/