[Libreoffice-commits] core.git: tools/source

Caolán McNamara caolanm at redhat.com
Tue Jul 7 09:13:48 PDT 2015


 tools/source/zcodec/zcodec.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8cb69cc82c11b640c0328f4788c05bed1ac15e90
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 7 17:12:13 2015 +0100

    -1 -> Z_ERRNO for clarity
    
    Change-Id: I29aa8531646f416a72b89f7571b757c39705c31a

diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index d6b9169..e0d6a88 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -153,7 +153,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
                 UpdateCRC( mpInBuf, nInToRead );
 
         }
-        err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : -1;
+        err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
         if ( err < 0 )
         {
             mbStatus = false;
@@ -220,7 +220,7 @@ long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize )
                 UpdateCRC( mpInBuf, nInToRead );
 
         }
-        err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : -1;
+        err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
         if ( err < 0 )
         {
             // Accept Z_BUF_ERROR as EAGAIN or EWOULDBLOCK.
@@ -273,7 +273,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize
                 UpdateCRC( mpInBuf, nInToRead );
 
         }
-        err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : -1;
+        err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
         if ( err < 0 )
         {
             // Accept Z_BUF_ERROR as EAGAIN or EWOULDBLOCK.


More information about the Libreoffice-commits mailing list