Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: third_party/zlib/gzguts.h

Issue 2690623003: Update zlib to 1.2.11 (Closed)
Patch Set: Drop the inflater change, improve the deflater comment Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/zlib/google.patch ('k') | third_party/zlib/gzlib.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* gzguts.h -- zlib internal header definitions for gz* operations 1 /* gzguts.h -- zlib internal header definitions for gz* operations
2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler 2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
6 #ifdef _LARGEFILE64_SOURCE 6 #ifdef _LARGEFILE64_SOURCE
7 # ifndef _LARGEFILE_SOURCE 7 # ifndef _LARGEFILE_SOURCE
8 # define _LARGEFILE_SOURCE 1 8 # define _LARGEFILE_SOURCE 1
9 # endif 9 # endif
10 # ifdef _FILE_OFFSET_BITS 10 # ifdef _FILE_OFFSET_BITS
11 # undef _FILE_OFFSET_BITS 11 # undef _FILE_OFFSET_BITS
12 # endif 12 # endif
13 #endif 13 #endif
14 14
15 #ifdef HAVE_HIDDEN 15 #ifdef HAVE_HIDDEN
16 # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) 16 # define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
17 #else 17 #else
18 # define ZLIB_INTERNAL 18 # define ZLIB_INTERNAL
19 #endif 19 #endif
20 20
21 #include <stdio.h> 21 #include <stdio.h>
22 #include "zlib.h" 22 #include "zlib.h"
23 #ifdef STDC 23 #ifdef STDC
24 # include <string.h> 24 # include <string.h>
25 # include <stdlib.h> 25 # include <stdlib.h>
26 # include <limits.h> 26 # include <limits.h>
27 #endif 27 #endif
28
29 #ifndef _POSIX_SOURCE
30 # define _POSIX_SOURCE
31 #endif
28 #include <fcntl.h> 32 #include <fcntl.h>
29 33
30 #ifdef _WIN32 34 #ifdef _WIN32
31 # include <stddef.h> 35 # include <stddef.h>
32 #endif 36 #endif
33 37
34 #if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) 38 #if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
35 # include <io.h> 39 # include <io.h>
36 #endif 40 #endif
37 41
42 #if defined(_WIN32) || defined(__CYGWIN__)
43 # define WIDECHAR
44 #endif
45
38 #ifdef WINAPI_FAMILY 46 #ifdef WINAPI_FAMILY
39 # define open _open 47 # define open _open
40 # define read _read 48 # define read _read
41 # define write _write 49 # define write _write
42 # define close _close 50 # define close _close
43 #endif 51 #endif
44 52
45 #ifdef NO_DEFLATE /* for compatibility with old definition */ 53 #ifdef NO_DEFLATE /* for compatibility with old definition */
46 # define NO_GZCOMPRESS 54 # define NO_GZCOMPRESS
47 #endif 55 #endif
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 # define NO_vsnprintf 96 # define NO_vsnprintf
89 # endif 97 # endif
90 # ifdef __OS400__ 98 # ifdef __OS400__
91 # define NO_vsnprintf 99 # define NO_vsnprintf
92 # endif 100 # endif
93 # ifdef __MVS__ 101 # ifdef __MVS__
94 # define NO_vsnprintf 102 # define NO_vsnprintf
95 # endif 103 # endif
96 #endif 104 #endif
97 105
98 /* unlike snprintf (which is required in C99, yet still not supported by 106 /* unlike snprintf (which is required in C99), _snprintf does not guarantee
99 Microsoft more than a decade later!), _snprintf does not guarantee null 107 null termination of the result -- however this is only used in gzlib.c where
100 termination of the result -- however this is only used in gzlib.c where
101 the result is assured to fit in the space provided */ 108 the result is assured to fit in the space provided */
102 #ifdef _MSC_VER 109 #if defined(_MSC_VER) && _MSC_VER < 1900
103 # define snprintf _snprintf 110 # define snprintf _snprintf
104 #endif 111 #endif
105 112
106 #ifndef local 113 #ifndef local
107 # define local static 114 # define local static
108 #endif 115 #endif
109 /* compile with -Dlocal if your debugger can't find static symbols */ 116 /* since "static" is used to mean two completely different things in C, we
117 define "local" for the non-static meaning of "static", for readability
118 (compile with -Dlocal if your debugger can't find static symbols) */
110 119
111 /* gz* functions always use library allocation functions */ 120 /* gz* functions always use library allocation functions */
112 #ifndef STDC 121 #ifndef STDC
113 extern voidp malloc OF((uInt size)); 122 extern voidp malloc OF((uInt size));
114 extern void free OF((voidpf ptr)); 123 extern void free OF((voidpf ptr));
115 #endif 124 #endif
116 125
117 /* get errno and strerror definition */ 126 /* get errno and strerror definition */
118 #if defined UNDER_CE 127 #if defined UNDER_CE
119 # include <windows.h> 128 # include <windows.h>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 struct gzFile_s x; /* "x" for exposed */ 172 struct gzFile_s x; /* "x" for exposed */
164 /* x.have: number of bytes available at x.next */ 173 /* x.have: number of bytes available at x.next */
165 /* x.next: next output data to deliver or write */ 174 /* x.next: next output data to deliver or write */
166 /* x.pos: current position in uncompressed data */ 175 /* x.pos: current position in uncompressed data */
167 /* used for both reading and writing */ 176 /* used for both reading and writing */
168 int mode; /* see gzip modes above */ 177 int mode; /* see gzip modes above */
169 int fd; /* file descriptor */ 178 int fd; /* file descriptor */
170 char *path; /* path or fd for error messages */ 179 char *path; /* path or fd for error messages */
171 unsigned size; /* buffer size, zero if not allocated yet */ 180 unsigned size; /* buffer size, zero if not allocated yet */
172 unsigned want; /* requested buffer size, default is GZBUFSIZE */ 181 unsigned want; /* requested buffer size, default is GZBUFSIZE */
173 unsigned char *in; /* input buffer */ 182 unsigned char *in; /* input buffer (double-sized when writing) */
174 unsigned char *out; /* output buffer (double-sized when reading) */ 183 unsigned char *out; /* output buffer (double-sized when reading) */
175 int direct; /* 0 if processing gzip, 1 if transparent */ 184 int direct; /* 0 if processing gzip, 1 if transparent */
176 /* just for reading */ 185 /* just for reading */
177 int how; /* 0: get header, 1: copy, 2: decompress */ 186 int how; /* 0: get header, 1: copy, 2: decompress */
178 z_off64_t start; /* where the gzip data started, for rewinding */ 187 z_off64_t start; /* where the gzip data started, for rewinding */
179 int eof; /* true if end of input file reached */ 188 int eof; /* true if end of input file reached */
180 int past; /* true if read requested past end */ 189 int past; /* true if read requested past end */
181 /* just for writing */ 190 /* just for writing */
182 int level; /* compression level */ 191 int level; /* compression level */
183 int strategy; /* compression strategy */ 192 int strategy; /* compression strategy */
(...skipping 16 matching lines...) Expand all
200 209
201 /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t 210 /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
202 value -- needed when comparing unsigned to z_off64_t, which is signed 211 value -- needed when comparing unsigned to z_off64_t, which is signed
203 (possible z_off64_t types off_t, off64_t, and long are all signed) */ 212 (possible z_off64_t types off_t, off64_t, and long are all signed) */
204 #ifdef INT_MAX 213 #ifdef INT_MAX
205 # define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) 214 # define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
206 #else 215 #else
207 unsigned ZLIB_INTERNAL gz_intmax OF((void)); 216 unsigned ZLIB_INTERNAL gz_intmax OF((void));
208 # define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) 217 # define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
209 #endif 218 #endif
OLDNEW
« no previous file with comments | « third_party/zlib/google.patch ('k') | third_party/zlib/gzlib.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698