From a40c44819919f0fa21ff3f39cbd0777aabd590d6 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon, 19 Jun 2006 12:54:26 +0000
Subject: INTEGRATION: CWS warnings01 (1.6.96); FILE MERGED 2006/02/24 14:48:56
 sb 1.6.96.3: #i53898# Made code warning-free; removed dead code. 2005/09/22
 21:44:07 sb 1.6.96.2: RESYNC: (1.6-1.7); FILE MERGED 2005/09/08 13:41:38 sj
 1.6.96.1: #53898# Warning-free code

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

(limited to 'tools')

diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 32dda3791272..3f02e14bb1c3 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: zcodec.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 14:40:41 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 13:54:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -154,7 +154,6 @@ long ZCodec::EndCompression()
 
 long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm )
 {
-    char err;
     long nOldTotal_In = PZSTREAM->total_in;
 
     if ( mbInit == 0 )
@@ -168,8 +167,7 @@ long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm )
     {
         if ( PZSTREAM->avail_out == 0 )
             ImplWriteBack();
-        err = deflate( PZSTREAM, Z_NO_FLUSH );
-        if ( err < 0 )
+        if ( deflate( PZSTREAM, Z_NO_FLUSH ) < 0 )
         {
             mbStatus = FALSE;
             break;
@@ -182,7 +180,7 @@ long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm )
 
 long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
 {
-    char    err;
+    int err;
     ULONG   nInToRead;
     long    nOldTotal_Out = PZSTREAM->total_out;
 
@@ -256,7 +254,7 @@ long ZCodec::Write( SvStream& rOStm, const BYTE* pData, ULONG nSize )
 
 long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize )
 {
-    char    err;
+    int err;
     ULONG   nInToRead;
 
     if ( mbFinish )
@@ -301,11 +299,9 @@ long ZCodec::Read( SvStream& rIStm, BYTE* pData, ULONG nSize )
 
 // ------------------------------------------------------------------------
 
-#pragma optimize ("",off)
-
 long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize )
 {
-    char    err = 0;
+    int err = 0;
     ULONG   nInToRead;
 
     if ( mbFinish )
@@ -360,8 +356,6 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, BYTE* pData, ULONG nSize )
     return (mbStatus ? (long)(nSize - PZSTREAM->avail_out) : -1);
 }
 
-#pragma optimize ("",on)
-
 // ------------------------------------------------------------------------
 
 void ZCodec::ImplWriteBack()
-- 
cgit