third_party/zlib/mixed-source.patch - Issue 10874087: Merge 151720 - net: workaround compression leaks

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/zlib/mixed-source.patch

Issue 10874087: Merge 151720 - net: workaround compression leaks (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/

Patch Set: Created 8 years, 3 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 | Annotate | Revision Log

« no previous file with comments | « third_party/zlib/deflate.c ('k') | third_party/zlib/zlib.h » ('j') | no next file with comments »

OLD	NEW
1 diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c	1 diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c

2 index 5c4022f..02d1516 100644	2 index 5c4022f..02d1516 100644

3 --- a/third_party/zlib/deflate.c	3 --- a/third_party/zlib/deflate.c

4 +++ b/third_party/zlib/deflate.c	4 +++ b/third_party/zlib/deflate.c

5 @@ -70,14 +70,15 @@ typedef enum {	5 @@ -70,14 +70,15 @@ typedef enum {

6 finish_done /* finish done, accept no more input or output */	6 finish_done /* finish done, accept no more input or output */

7 } block_state;	7 } block_state;

8	8

9 -typedef block_state (compress_func) OF((deflate_state s, int flush));	9 -typedef block_state (compress_func) OF((deflate_state s, int flush));

10 +typedef block_state (compress_func) OF((deflate_state s, int flush,	10 +typedef block_state (compress_func) OF((deflate_state s, int flush,

(...skipping 471 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
482 +# else	482 +# else

483 + ZEXTERN gzFile ZEXPORT gzopen OF((const char , const char ));	483 + ZEXTERN gzFile ZEXPORT gzopen OF((const char , const char ));

484 + ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));	484 + ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));

485 + ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));	485 + ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));

486 + ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));	486 + ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));

487 + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));	487 + ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));

488 + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));	488 + ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));

489 # endif	489 # endif

490 #else	490 #else

491 ZEXTERN gzFile ZEXPORT gzopen OF((const char , const char ));	491 ZEXTERN gzFile ZEXPORT gzopen OF((const char , const char ));

OLD	NEW