[haiku-commits] haiku: hrev46860 - in src/kits: shared package/hpkg package/hpkg/v1
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 12 Feb 2014 14:05:12 +0100 (CET)
hrev46860 adds 1 changeset to branch 'master'
old head: f6658d2c2c27f2df33d5db2f485551ab737331b1
new head: 916382a10f471ca31087dd71b8d3ece5de9cd421
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=916382a+%5Ef6658d2
----------------------------------------------------------------------------
916382a: Style fixes, no functional changes
* Pointed out by Axel and Ingo.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46860
Commit: 916382a10f471ca31087dd71b8d3ece5de9cd421
URL: http://cgit.haiku-os.org/haiku/commit/?id=916382a
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Wed Feb 12 13:05:27 2014 UTC
----------------------------------------------------------------------------
4 files changed, 11 insertions(+), 11 deletions(-)
src/kits/package/hpkg/DataReader.cpp | 2 +-
src/kits/package/hpkg/ZlibCompressor.cpp | 4 ++--
src/kits/package/hpkg/v1/PackageDataReaderV1.cpp | 4 ++--
src/kits/shared/ZlibDecompressor.cpp | 12 ++++++------
----------------------------------------------------------------------------
diff --git a/src/kits/package/hpkg/DataReader.cpp
b/src/kits/package/hpkg/DataReader.cpp
index 47893bb..97bc29f 100644
--- a/src/kits/package/hpkg/DataReader.cpp
+++ b/src/kits/package/hpkg/DataReader.cpp
@@ -83,7 +83,7 @@ BBufferDataReader::ReadDataToOutput(off_t offset, size_t size,
return B_ERROR;
ssize_t result = output->Write((const uint8*)fData + offset, size);
- if (result > B_OK)
+ if (result >= 0)
return B_OK;
return result;
}
diff --git a/src/kits/package/hpkg/ZlibCompressor.cpp
b/src/kits/package/hpkg/ZlibCompressor.cpp
index 723dbb3..9e7dacc 100644
--- a/src/kits/package/hpkg/ZlibCompressor.cpp
+++ b/src/kits/package/hpkg/ZlibCompressor.cpp
@@ -84,7 +84,7 @@ ZlibCompressor::CompressNext(const void* input, size_t
inputSize)
if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < B_OK)
+ if (error < 0)
return error;
}
}
@@ -111,7 +111,7 @@ ZlibCompressor::Finish()
if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < B_OK)
+ if (error < 0)
return error;
}
diff --git a/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
b/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
index 2679b74..c45e0ab 100644
--- a/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
+++ b/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
@@ -126,7 +126,7 @@ public:
// write to the output
error = output->Write(buffer->Buffer(), toRead);
- if (error < B_OK)
+ if (error < 0)
return error;
offset += toRead;
@@ -246,7 +246,7 @@ public:
size_t toCopy = std::min(size, (size_t)fChunkSize -
inChunkOffset);
error = output->Write(
(uint8*)fUncompressBuffer->Buffer() +
inChunkOffset, toCopy);
- if (error < B_OK)
+ if (error < 0)
return error;
size -= toCopy;
diff --git a/src/kits/shared/ZlibDecompressor.cpp
b/src/kits/shared/ZlibDecompressor.cpp
index 07e5c09..5643f3a 100644
--- a/src/kits/shared/ZlibDecompressor.cpp
+++ b/src/kits/shared/ZlibDecompressor.cpp
@@ -85,10 +85,10 @@ ZlibDecompressor::DecompressNext(const void* input, size_t
inputSize)
return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) {
- status_t error = fOutput->Write(outputBuffer,
+ ssize_t result = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < B_OK)
- return error;
+ if (result < 0)
+ return result;
}
}
@@ -114,10 +114,10 @@ ZlibDecompressor::Finish()
return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) {
- status_t error = fOutput->Write(outputBuffer,
+ ssize_t result = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < B_OK)
- return error;
+ if (result < 0)
+ return result;
}
}
Other related posts:
