diff options
| author | tymyjan <tymyjan@yahoo.co.uk> | 2016-06-04 23:54:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-06-27 10:18:49 +0000 |
| commit | 08fc0da4033b8ea2b3ae67aa06175e839771396b (patch) | |
| tree | f4d64a97d2cf6052792f83414492de946a859a9b /tools/source/zcodec | |
| parent | f7c888994db744396c69aa1be720c2089ada5798 (diff) | |
tdf#75280 Cleaning up of sal_uIntPtr usage #1a
Change-Id: Ief2cc6ab03316c2530d386d662db21ca1c9ddb30
Reviewed-on: https://gerrit.libreoffice.org/25898
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'tools/source/zcodec')
| -rw-r--r-- | tools/source/zcodec/zcodec.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index e841888a54b7..839ef4cf35f8 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -134,7 +134,7 @@ void ZCodec::Compress( SvStream& rIStm, SvStream& rOStm ) long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm ) { int err; - sal_uIntPtr nInToRead; + size_t nInToRead; long nOldTotal_Out = PZSTREAM->total_out; assert(meState == STATE_INIT); @@ -169,7 +169,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm ) return ( mbStatus ) ? (long)(PZSTREAM->total_out - nOldTotal_Out) : -1; } -void ZCodec::Write( SvStream& rOStm, const sal_uInt8* pData, sal_uIntPtr nSize ) +void ZCodec::Write( SvStream& rOStm, const sal_uInt8* pData, sal_uInt32 nSize ) { if (meState == STATE_INIT) { @@ -194,10 +194,10 @@ void ZCodec::Write( SvStream& rOStm, const sal_uInt8* pData, sal_uIntPtr nSize ) } } -long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize ) +long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, sal_uInt32 nSize ) { int err; - sal_uIntPtr nInToRead; + size_t nInToRead; if ( mbFinish ) return 0; // PZSTREAM->total_out; @@ -238,10 +238,10 @@ long ZCodec::Read( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize ) return (mbStatus ? (long)(nSize - PZSTREAM->avail_out) : -1); } -long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize ) +long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uInt32 nSize ) { int err = 0; - sal_uIntPtr nInToRead; + size_t nInToRead; if ( mbFinish ) return 0; // PZSTREAM->total_out; @@ -258,7 +258,7 @@ long ZCodec::ReadAsynchron( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize { nInToRead = (mnInBufSize > mnInToRead) ? mnInToRead : mnInBufSize; - sal_uInt64 const nRemaining = rIStm.remainingSize(); + sal_uInt32 const nRemaining = rIStm.remainingSize(); if (nRemaining < nInToRead) { rIStm.SetError( ERRCODE_IO_PENDING ); @@ -305,17 +305,17 @@ void ZCodec::ImplWriteBack() } } -void ZCodec::SetBreak( sal_uIntPtr nInToRead ) +void ZCodec::SetBreak( size_t nInToRead ) { mnInToRead = nInToRead; } -sal_uIntPtr ZCodec::GetBreak() +size_t ZCodec::GetBreak() { return ( mnInToRead + PZSTREAM->avail_in ); } -void ZCodec::SetCRC( sal_uIntPtr nCRC ) +void ZCodec::SetCRC( sal_uInt32 nCRC ) { mnCRC = nCRC; } |