diff options
Diffstat (limited to 'src/3rdparty/zlib')
| -rw-r--r-- | src/3rdparty/zlib/ChangeLog | 4 | ||||
| -rw-r--r-- | src/3rdparty/zlib/FAQ | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/Makefile.in | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/README | 2 | ||||
| -rwxr-xr-x | src/3rdparty/zlib/configure | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/deflate.c | 4 | ||||
| -rw-r--r-- | src/3rdparty/zlib/gzio.c | 4 | ||||
| -rw-r--r-- | src/3rdparty/zlib/infback.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/inffast.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/projects/README.projects | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/trees.c | 6 | ||||
| -rw-r--r-- | src/3rdparty/zlib/win32/DLL_FAQ.txt | 10 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zconf.h | 6 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zconf.in.h | 6 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zlib.3 | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zlib.h | 12 |
16 files changed, 34 insertions, 34 deletions
diff --git a/src/3rdparty/zlib/ChangeLog b/src/3rdparty/zlib/ChangeLog index c5eebaab6..d60b6d377 100644 --- a/src/3rdparty/zlib/ChangeLog +++ b/src/3rdparty/zlib/ChangeLog @@ -277,7 +277,7 @@ Changes in 1.2.0 (9 March 2003) - Point out that zlib and gzip formats are different - Note that Z_BUF_ERROR is not fatal - Document string limit for gzprintf() and possible buffer overflow - - Note retquirement on avail_out when flushing + - Note requirement on avail_out when flushing - Note permitted values of flush parameter of inflate() - Add some FAQs (and even answers) to the FAQ - Add contrib/inflate86/ for x86 faster inflate @@ -683,7 +683,7 @@ Changes in 0.92 (3 May 95) Changes in 0.91 (2 May 95) - Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h -- Document the memory retquirements in zconf.h +- Document the memory requirements in zconf.h - added "make install" - fix sync search logic in inflateSync - deflate(Z_FULL_FLUSH) now works even if output buffer too short diff --git a/src/3rdparty/zlib/FAQ b/src/3rdparty/zlib/FAQ index 0d9f4e051..4f61f1094 100644 --- a/src/3rdparty/zlib/FAQ +++ b/src/3rdparty/zlib/FAQ @@ -175,7 +175,7 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html No. Please read the license in zlib.h. 24. The license says that altered source versions must be "plainly marked". So - what exactly do I need to do to meet that retquirement? + what exactly do I need to do to meet that requirement? You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In particular, the final version number needs to be changed to "f", and an diff --git a/src/3rdparty/zlib/Makefile.in b/src/3rdparty/zlib/Makefile.in index f011d9f6b..a29e9bc6a 100644 --- a/src/3rdparty/zlib/Makefile.in +++ b/src/3rdparty/zlib/Makefile.in @@ -4,7 +4,7 @@ # To compile and test, type: # ./configure; make test -# The call of configure is optional if you don't have special retquirements +# The call of configure is optional if you don't have special requirements # If you wish to build zlib as a shared library, use: ./configure -s # To use the asm code, type: diff --git a/src/3rdparty/zlib/README b/src/3rdparty/zlib/README index a6092e359..df95ae13f 100644 --- a/src/3rdparty/zlib/README +++ b/src/3rdparty/zlib/README @@ -106,7 +106,7 @@ Copyright notice: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be - appreciated but is not retquired. + appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. diff --git a/src/3rdparty/zlib/configure b/src/3rdparty/zlib/configure index 00cafa8d8..6e138594e 100755 --- a/src/3rdparty/zlib/configure +++ b/src/3rdparty/zlib/configure @@ -154,7 +154,7 @@ SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} if test $shared -eq 1; then echo Checking for shared library support... - # we must test in two steps (cc then ld), retquired at least on SunOS 4.x + # we must test in two steps (cc then ld), required at least on SunOS 4.x if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" && test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then CFLAGS="$SFLAGS" diff --git a/src/3rdparty/zlib/deflate.c b/src/3rdparty/zlib/deflate.c index 7e970d43b..c7f75a3ec 100644 --- a/src/3rdparty/zlib/deflate.c +++ b/src/3rdparty/zlib/deflate.c @@ -149,7 +149,7 @@ local const config configuration_table[10] = { /* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ #endif -/* Note: the deflate() code retquires max_lazy >= MIN_MATCH and max_chain >= 4 +/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 * For deflate_fast() (levels <= 3) good is ignored and lazy has a different * meaning. */ @@ -1088,7 +1088,7 @@ local void check_match(s, start, match, length) * IN assertion: lookahead < MIN_LOOKAHEAD * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD * At least one byte has been read, or avail_in == 0; reads are - * performed for at least two bytes (retquired for the zip translate_eol + * performed for at least two bytes (required for the zip translate_eol * option -- not supported here). */ local void fill_window(s) diff --git a/src/3rdparty/zlib/gzio.c b/src/3rdparty/zlib/gzio.c index 74fc49545..c5cccf4d3 100644 --- a/src/3rdparty/zlib/gzio.c +++ b/src/3rdparty/zlib/gzio.c @@ -166,7 +166,7 @@ local gzFile gz_open (path, mode, fd) err = inflateInit2(&(s->stream), -MAX_WBITS); /* windowBits is passed < 0 to tell that there is no zlib header. - * Note that in this case inflate *retquires* an extra "dummy" byte + * Note that in this case inflate *requires* an extra "dummy" byte * after the compressed stream in order to complete decompression and * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are * present after the compressed stream. @@ -679,7 +679,7 @@ int ZEXPORT gzputc(file, c) gzFile file; int c; { - unsigned char cc = (unsigned char) c; /* retquired for big endian systems */ + unsigned char cc = (unsigned char) c; /* required for big endian systems */ return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; } diff --git a/src/3rdparty/zlib/infback.c b/src/3rdparty/zlib/infback.c index 99895dc66..262f97c73 100644 --- a/src/3rdparty/zlib/infback.c +++ b/src/3rdparty/zlib/infback.c @@ -225,7 +225,7 @@ struct inflate_state FAR *state; in() and out() are called with a descriptor parameter provided in the inflateBack() call. This parameter can be a structure that provides the - information retquired to do the read or write, as well as accumulated + information required to do the read or write, as well as accumulated information on the input and output such as totals and check values. in() should return zero on failure. out() should return non-zero on diff --git a/src/3rdparty/zlib/inffast.c b/src/3rdparty/zlib/inffast.c index 5bf31ac2a..8c02a178d 100644 --- a/src/3rdparty/zlib/inffast.c +++ b/src/3rdparty/zlib/inffast.c @@ -61,7 +61,7 @@ - The maximum bytes that a single length/distance pair can output is 258 bytes, which is the maximum length that can be coded. inflate_fast() - retquires strm->avail_out >= 258 for each loop to avoid checking for + requires strm->avail_out >= 258 for each loop to avoid checking for output space. */ void inflate_fast(strm, start) diff --git a/src/3rdparty/zlib/projects/README.projects b/src/3rdparty/zlib/projects/README.projects index 5b3b07cfa..56efb8e7c 100644 --- a/src/3rdparty/zlib/projects/README.projects +++ b/src/3rdparty/zlib/projects/README.projects @@ -2,7 +2,7 @@ This directory contains project files for building zlib under various Integrated Development Environments (IDE). If you wish to submit a new project to this directory, you should comply -to the following retquirements. Otherwise (e.g. if you wish to integrate +to the following requirements. Otherwise (e.g. if you wish to integrate a custom piece of code that changes the zlib interface or its behavior), please consider submitting the project to the contrib directory. diff --git a/src/3rdparty/zlib/trees.c b/src/3rdparty/zlib/trees.c index e62e4ac11..52c820fa2 100644 --- a/src/3rdparty/zlib/trees.c +++ b/src/3rdparty/zlib/trees.c @@ -642,7 +642,7 @@ local void build_tree(s, desc) } } - /* The pkzip format retquires that at least one distance code exists, + /* The pkzip format requires that at least one distance code exists, * and that at least one bit should be sent even if there is only one * possible code. So to avoid special checks later on we force at least * two codes of non zero frequency. @@ -816,7 +816,7 @@ local int build_bl_tree(s) */ /* Determine the number of bit length codes to send. The pkzip format - * retquires that at least 4 bit length codes be sent. (appnote.txt says + * requires that at least 4 bit length codes be sent. (appnote.txt says * 3 but the actual value used is 4.) */ for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { @@ -881,7 +881,7 @@ void _tr_stored_block(s, buf, stored_len, eof) /* =========================================================================== * Send one empty static block to give enough lookahead for inflate. * This takes 10 bits, of which 7 may remain in the bit buffer. - * The current inflate code retquires 9 bits of lookahead. If the + * The current inflate code requires 9 bits of lookahead. If the * last two codes for the previous block (real code plus EOB) were coded * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode * the last real code. In this case we send two empty static blocks instead diff --git a/src/3rdparty/zlib/win32/DLL_FAQ.txt b/src/3rdparty/zlib/win32/DLL_FAQ.txt index 725b32bd0..1746a951c 100644 --- a/src/3rdparty/zlib/win32/DLL_FAQ.txt +++ b/src/3rdparty/zlib/win32/DLL_FAQ.txt @@ -35,7 +35,7 @@ in the zlib distribution, or at the following location: web site, instead of building it yourself, to avoid potential incompatibilities that could be introduced by your compiler and build settings. If you do build the DLL yourself, please - make sure that it complies with all the above retquirements, + make sure that it complies with all the above requirements, and it runs with the precompiled test programs, bundled with the original ZLIB1.DLL distribution. @@ -46,7 +46,7 @@ in the zlib distribution, or at the following location: 2. Why did you change the name of the DLL to ZLIB1.DLL? What happened to the old ZLIB.DLL? - - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, retquired + - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required compilation settings that were incompatible to those used by a static build. The DLL settings were supposed to be enabled by defining the macro ZLIB_DLL, before including "zlib.h". @@ -176,8 +176,8 @@ in the zlib distribution, or at the following location: (GNAT) and Fortran (GNU G77), have C bindings implemented initially on Unix, and relying on the C calling convention. On the other hand, the pre- .Net versions of Microsoft Visual - Basic retquire STDCALL, while Borland Delphi prefers, although - it does not retquire, FASTCALL. + Basic require STDCALL, while Borland Delphi prefers, although + it does not require, FASTCALL. In fairness to all possible uses of zlib outside the C programming language, we choose the default "C" convention. @@ -213,7 +213,7 @@ in the zlib distribution, or at the following location: 9. If my application uses ZLIB1.DLL, should I link it to MSVCRT.DLL? Why? - - It is not retquired, but it is recommended to link your + - It is not required, but it is recommended to link your application to MSVCRT.DLL, if it uses ZLIB1.DLL. The executables (.EXE, .DLL, etc.) that are involved in the diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index c29f97091..3c21403fc 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -142,15 +142,15 @@ # define MAX_WBITS 15 /* 32K LZ77 window */ #endif -/* The memory retquirements for deflate are (in bytes): +/* The memory requirements for deflate are (in bytes): (1 << (windowBits+2)) + (1 << (memLevel+9)) that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) plus a few kilobytes for small objects. For example, if you want to reduce - the default memory retquirements from 256K to 128K, compile with + the default memory requirements from 256K to 128K, compile with make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" Of course this will generally degrade compression (there's no free lunch). - The memory retquirements for inflate are (in bytes) 1 << windowBits + The memory requirements for inflate are (in bytes) 1 << windowBits that is, 32K for windowBits=15 (default value) plus a few kilobytes for small objects. */ diff --git a/src/3rdparty/zlib/zconf.in.h b/src/3rdparty/zlib/zconf.in.h index c29f97091..3c21403fc 100644 --- a/src/3rdparty/zlib/zconf.in.h +++ b/src/3rdparty/zlib/zconf.in.h @@ -142,15 +142,15 @@ # define MAX_WBITS 15 /* 32K LZ77 window */ #endif -/* The memory retquirements for deflate are (in bytes): +/* The memory requirements for deflate are (in bytes): (1 << (windowBits+2)) + (1 << (memLevel+9)) that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) plus a few kilobytes for small objects. For example, if you want to reduce - the default memory retquirements from 256K to 128K, compile with + the default memory requirements from 256K to 128K, compile with make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" Of course this will generally degrade compression (there's no free lunch). - The memory retquirements for inflate are (in bytes) 1 << windowBits + The memory requirements for inflate are (in bytes) 1 << windowBits that is, 32K for windowBits=15 (default value) plus a few kilobytes for small objects. */ diff --git a/src/3rdparty/zlib/zlib.3 b/src/3rdparty/zlib/zlib.3 index 0f9e0ece1..3139e2467 100644 --- a/src/3rdparty/zlib/zlib.3 +++ b/src/3rdparty/zlib/zlib.3 @@ -141,7 +141,7 @@ This software is provided "as-is," without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -See the distribution directory with respect to retquirements +See the distribution directory with respect to requirements governing redistribution. The deflate format used by .I zlib diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 07c50c676..4c01661b0 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -14,7 +14,7 @@ 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be - appreciated but is not retquired. + appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. @@ -132,12 +132,12 @@ typedef z_stream FAR *z_streamp; thread safe. On 16-bit systems, the functions zalloc and zfree must be able to allocate - exactly 65536 bytes, but will not be retquired to allocate more than this + exactly 65536 bytes, but will not be required to allocate more than this if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers returned by zalloc for objects of exactly 65536 bytes *must* have their offset normalized to zero. The default allocation function provided by this library ensures this (see zutil.c). To reduce memory - retquirements and avoid any allocation of 64K objects, at the expense of + requirements and avoid any allocation of 64K objects, at the expense of compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). The fields total_in and total_out can be used for statistics or @@ -402,7 +402,7 @@ ZEXTERN int Q_ZEXPORT inflate OF((z_streamp strm, int flush)); uncompressed data. (The size of the uncompressed data may have been saved by the compressor for this purpose.) The next operation on this stream must be inflateEnd to deallocate the decompression state. The use of Z_FINISH - is never retquired, but can be used to inform inflate that a faster approach + is never required, but can be used to inform inflate that a faster approach may be used for the single inflate() call. In this implementation, inflate() always flushes as much output as @@ -1136,7 +1136,7 @@ ZEXTERN uLong Q_ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); /* Update a running Adler-32 checksum with the bytes buf[0..len-1] and return the updated checksum. If buf is NULL, this function returns - the retquired initial value for the checksum. + the required initial value for the checksum. An Adler-32 checksum is almost as reliable as a CRC32 but can be computed much faster. Usage example: @@ -1151,7 +1151,7 @@ ZEXTERN uLong Q_ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); ZEXTERN uLong Q_ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); /* Update a running crc with the bytes buf[0..len-1] and return the updated - crc. If buf is NULL, this function returns the retquired initial value + crc. If buf is NULL, this function returns the required initial value for the crc. Pre- and post-conditioning (one's complement) is performed within this function so it shouldn't be done by the application. Usage example: |