summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Ivanov <pi@berkeley.edu>2023-11-14 16:23:02 -0800
committerMark Adler <madler@alumni.caltech.edu>2023-11-14 18:44:32 -0800
commit643e17b7498d12ab8d15565662880579692f769d (patch)
tree21d835548124922e575644bb0165574552fff6fa
parent15c45adb76e81a7e3a8a9e17b2a56eb90f668f44 (diff)
downloadzlib-643e17b7498d12ab8d15565662880579692f769d.tar.gz
zlib-643e17b7498d12ab8d15565662880579692f769d.tar.bz2
zlib-643e17b7498d12ab8d15565662880579692f769d.zip
Correct repeated words in source file comments and a readme.
-rw-r--r--contrib/infback9/inftree9.h4
-rw-r--r--contrib/minizip/ioapi.h2
-rw-r--r--contrib/minizip/zip.c4
-rw-r--r--contrib/minizip/zip.h4
-rw-r--r--inftrees.h4
-rw-r--r--win32/README-WIN32.txt4
-rw-r--r--zlib.h8
7 files changed, 15 insertions, 15 deletions
diff --git a/contrib/infback9/inftree9.h b/contrib/infback9/inftree9.h
index 2c1252f..ab2ea28 100644
--- a/contrib/infback9/inftree9.h
+++ b/contrib/infback9/inftree9.h
@@ -41,8 +41,8 @@ typedef struct {
41 examples/enough.c found in the zlib distribution. The arguments to that 41 examples/enough.c found in the zlib distribution. The arguments to that
42 program are the number of symbols, the initial root table size, and the 42 program are the number of symbols, the initial root table size, and the
43 maximum bit length of a code. "enough 286 9 15" for literal/length codes 43 maximum bit length of a code. "enough 286 9 15" for literal/length codes
44 returns returns 852, and "enough 32 6 15" for distance codes returns 594. 44 returns 852, and "enough 32 6 15" for distance codes returns 594. The
45 The initial root table size (9 or 6) is found in the fifth argument of the 45 initial root table size (9 or 6) is found in the fifth argument of the
46 inflate_table() calls in infback9.c. If the root table size is changed, 46 inflate_table() calls in infback9.c. If the root table size is changed,
47 then these maximum sizes would be need to be recalculated and updated. */ 47 then these maximum sizes would be need to be recalculated and updated. */
48#define ENOUGH_LENS 852 48#define ENOUGH_LENS 852
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
index c588a18..a2d2e6e 100644
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -144,7 +144,7 @@ typedef long (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream)
144typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin); 144typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
145 145
146 146
147/* here is the "old" 32 bits structure structure */ 147/* here is the "old" 32 bits structure */
148typedef struct zlib_filefunc_def_s 148typedef struct zlib_filefunc_def_s
149{ 149{
150 open_file_func zopen_file; 150 open_file_func zopen_file;
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index 86be90b..e2e9da0 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -614,9 +614,9 @@ local int LoadCentralDirectoryRecord(zip64_internal* pziinit) {
614 ZPOS64_T central_pos; 614 ZPOS64_T central_pos;
615 uLong uL; 615 uLong uL;
616 616
617 uLong number_disk; /* number of the current dist, used for 617 uLong number_disk; /* number of the current disk, used for
618 spanning ZIP, unsupported, always 0*/ 618 spanning ZIP, unsupported, always 0*/
619 uLong number_disk_with_CD; /* number the the disk with central dir, used 619 uLong number_disk_with_CD; /* number of the disk with central dir, used
620 for spanning ZIP, unsupported, always 0*/ 620 for spanning ZIP, unsupported, always 0*/
621 ZPOS64_T number_entry; 621 ZPOS64_T number_entry;
622 ZPOS64_T number_entry_CD; /* total number of entries in 622 ZPOS64_T number_entry_CD; /* total number of entries in
diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h
index 5fc0841..3e230d3 100644
--- a/contrib/minizip/zip.h
+++ b/contrib/minizip/zip.h
@@ -177,9 +177,9 @@ extern int ZEXPORT zipOpenNewFileInZip64(zipFile file,
177 filename : the filename in zip (if NULL, '-' without quote will be used 177 filename : the filename in zip (if NULL, '-' without quote will be used
178 *zipfi contain supplemental information 178 *zipfi contain supplemental information
179 if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local 179 if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
180 contains the extrafield data the the local header 180 contains the extrafield data for the local header
181 if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global 181 if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
182 contains the extrafield data the the local header 182 contains the extrafield data for the global header
183 if comment != NULL, comment contain the comment string 183 if comment != NULL, comment contain the comment string
184 method contain the compression method (0 for store, Z_DEFLATED for deflate) 184 method contain the compression method (0 for store, Z_DEFLATED for deflate)
185 level contain the level of compression (can be Z_DEFAULT_COMPRESSION) 185 level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
diff --git a/inftrees.h b/inftrees.h
index a10712d..396f74b 100644
--- a/inftrees.h
+++ b/inftrees.h
@@ -41,8 +41,8 @@ typedef struct {
41 examples/enough.c found in the zlib distribution. The arguments to that 41 examples/enough.c found in the zlib distribution. The arguments to that
42 program are the number of symbols, the initial root table size, and the 42 program are the number of symbols, the initial root table size, and the
43 maximum bit length of a code. "enough 286 9 15" for literal/length codes 43 maximum bit length of a code. "enough 286 9 15" for literal/length codes
44 returns returns 852, and "enough 30 6 15" for distance codes returns 592. 44 returns 852, and "enough 30 6 15" for distance codes returns 592. The
45 The initial root table size (9 or 6) is found in the fifth argument of the 45 initial root table size (9 or 6) is found in the fifth argument of the
46 inflate_table() calls in inflate.c and infback.c. If the root table size is 46 inflate_table() calls in inflate.c and infback.c. If the root table size is
47 changed, then these maximum sizes would be need to be recalculated and 47 changed, then these maximum sizes would be need to be recalculated and
48 updated. */ 48 updated. */
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index 2790e83..600fa3f 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -16,8 +16,8 @@ is http://zlib.net/ . Before reporting a problem, please check this site to
16verify that you have the latest version of zlib; otherwise get the latest 16verify that you have the latest version of zlib; otherwise get the latest
17version and check whether the problem still exists or not. 17version and check whether the problem still exists or not.
18 18
19PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html 19PLEASE read DLL_FAQ.txt, and the zlib FAQ http://zlib.net/zlib_faq.html before
20before asking for help. 20asking for help.
21 21
22 22
23Manifest: 23Manifest:
diff --git a/zlib.h b/zlib.h
index ff0fd7e..b3e19fc 100644
--- a/zlib.h
+++ b/zlib.h
@@ -936,10 +936,10 @@ ZEXTERN int ZEXPORT inflateSync(z_streamp strm);
936 inflateSync returns Z_OK if a possible full flush point has been found, 936 inflateSync returns Z_OK if a possible full flush point has been found,
937 Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point 937 Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
938 has been found, or Z_STREAM_ERROR if the stream structure was inconsistent. 938 has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
939 In the success case, the application may save the current current value of 939 In the success case, the application may save the current value of total_in
940 total_in which indicates where valid compressed data was found. In the 940 which indicates where valid compressed data was found. In the error case,
941 error case, the application may repeatedly call inflateSync, providing more 941 the application may repeatedly call inflateSync, providing more input each
942 input each time, until success or end of the input data. 942 time, until success or end of the input data.
943*/ 943*/
944 944
945ZEXTERN int ZEXPORT inflateCopy(z_streamp dest, 945ZEXTERN int ZEXPORT inflateCopy(z_streamp dest,