diff options
Diffstat (limited to 'zip/ZipArchive/bzip2/bzlib.c')
| -rw-r--r-- | zip/ZipArchive/bzip2/bzlib.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/zip/ZipArchive/bzip2/bzlib.c b/zip/ZipArchive/bzip2/bzlib.c index 9e560da..25034d5 100644 --- a/zip/ZipArchive/bzip2/bzlib.c +++ b/zip/ZipArchive/bzip2/bzlib.c @@ -8,14 +8,14 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> + bzip2/libbzip2 version 1.0.8 of 13 July 2019 + Copyright (C) 1996-2019 Julian Seward <jseward@acm.org> Please read the WARNING, DISCLAIMER and PATENTS sections in the - bzlib.h file. + README file. This program is released under the terms of the license contained - in the file bzlib.h. + in the file LICENSE. ------------------------------------------------------------------ */ /* CHANGES @@ -29,8 +29,13 @@ */ #include "bzlib_private.h" - -#ifdef ZIP_ARCHIVE_BZIP2_INTERNAL +// TD CHANGE: +#if _MSC_VER > 1000 +#pragma warning (push) +#pragma warning (disable : 6386) +#pragma warning (disable : 4267) +#pragma warning (disable : 4996) +#endif /*---------------------------------------------------*/ /*--- Compression stuff ---*/ @@ -44,12 +49,12 @@ void BZ2_bz__AssertH__fail ( int errcode ) fprintf(stderr, "\n\nbzip2/libbzip2: internal error number %d.\n" "This is a bug in bzip2/libbzip2, %s.\n" - "Please report it to me at: jseward@bzip.org. If this happened\n" + "Please report it to: bzip2-devel@sourceware.org. If this happened\n" "when you were using some program which uses libbzip2 as a\n" "component, you should also report this bug to the author(s)\n" "of that program. Please make an effort to report this bug;\n" "timely and accurate bug reports eventually lead to higher\n" - "quality software. Thanks. Julian Seward, 15 February 2005.\n\n", + "quality software. Thanks.\n\n", errcode, BZ2_bzlibVersion() ); @@ -599,6 +604,7 @@ Bool unRLE_obuf_to_output_FAST ( DState* s ) UInt32 c_tPos = s->tPos; char* cs_next_out = s->strm->next_out; unsigned int cs_avail_out = s->strm->avail_out; + Int32 ro_blockSize100k = s->blockSize100k; /* end restore */ UInt32 avail_out_INIT = cs_avail_out; @@ -1420,7 +1426,11 @@ BZFILE * bzopen_or_bzdopen if (open_mode==0) { if (path==NULL || strcmp(path,"")==0) { fp = (writing ? stdout : stdin); - SET_BINARY_MODE(fp); +// TD CHANGE: +#if _MSC_VER > 1000 + #pragma warning (disable : 6031) +#endif + SET_BINARY_MODE(fp); } else { fp = fopen(path,mode2); } @@ -1564,10 +1574,14 @@ const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum) *errnum = err; return bzerrorstrings[err*-1]; } +// TD CHANGE: +#if _MSC_VER > 1000 + #pragma warning (pop) #endif #endif + /*-------------------------------------------------------------*/ /*--- end bzlib.c ---*/ /*-------------------------------------------------------------*/ |