From 916382a10f471ca31087dd71b8d3ece5de9cd421 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 12 Feb 2014 14:05:27 +0100 Subject: [PATCH] Style fixes, no functional changes * Pointed out by Axel and Ingo. --- 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 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/kits/package/hpkg/DataReader.cpp b/src/kits/package/hpkg/DataReader.cpp index 47893bb5eb..97bc29f372 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 723dbb31e3..9e7dacc561 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 2679b74b73..c45e0ab556 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 07e5c09dcb..5643f3a096 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; } }