i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Style fixes, no functional changes"

Browse Source 
This reverts commit 916382a10f.
This commit is contained in:
Ingo Weinhold
2014-06-18 22:13:37 +02:00
parent a01adf34d6
commit cc66d3a051
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/package/hpkg/DataReader.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ BBufferDataReader::ReadDataToOutput(off_t offset, size_t size,
return B_ERROR; return B_ERROR;
ssize_t result = output->Write((const uint8*)fData + offset, size); ssize_t result = output->Write((const uint8*)fData + offset, size);
if (result >= 0) if (result > B_OK)
return B_OK; return B_OK;
return result; return result;
} }
src/kits/package/hpkg/ZlibCompressor.cpp
+2 -2
View File
@@ -84,7 +84,7 @@ ZlibCompressor::CompressNext(const void* input, size_t inputSize)
if (fStream.avail_out < sizeof(outputBuffer)) { if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer, status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out); sizeof(outputBuffer) - fStream.avail_out);
if (error < 0) if (error < B_OK)
return error; return error;
} }
} }
@@ -111,7 +111,7 @@ ZlibCompressor::Finish()
if (fStream.avail_out < sizeof(outputBuffer)) { if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer, status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out); sizeof(outputBuffer) - fStream.avail_out);
if (error < 0) if (error < B_OK)
return error; return error;
} }
src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
+2 -2
View File
@@ -126,7 +126,7 @@ public:
// write to the output // write to the output
error = output->Write(buffer->Buffer(), toRead); error = output->Write(buffer->Buffer(), toRead);
if (error < 0) if (error < B_OK)
return error; return error;
offset += toRead; offset += toRead;
@@ -246,7 +246,7 @@ public:
size_t toCopy = std::min(size, (size_t)fChunkSize - inChunkOffset); size_t toCopy = std::min(size, (size_t)fChunkSize - inChunkOffset);
error = output->Write( error = output->Write(
(uint8*)fUncompressBuffer->Buffer() + inChunkOffset, toCopy); (uint8*)fUncompressBuffer->Buffer() + inChunkOffset, toCopy);
if (error < 0) if (error < B_OK)
return error; return error;
size -= toCopy; size -= toCopy;
src/kits/shared/ZlibDecompressor.cpp
+6 -6
View File
@@ -85,10 +85,10 @@ ZlibDecompressor::DecompressNext(const void* input, size_t inputSize)
return TranslateZlibError(zlibError); return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) { if (fStream.avail_out < sizeof(outputBuffer)) {
ssize_t result = fOutput->Write(outputBuffer, status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out); sizeof(outputBuffer) - fStream.avail_out);
if (result < 0) if (error < B_OK)
return result; return error;
} }
} }
@@ -114,10 +114,10 @@ ZlibDecompressor::Finish()
return TranslateZlibError(zlibError); return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) { if (fStream.avail_out < sizeof(outputBuffer)) {
ssize_t result = fOutput->Write(outputBuffer, status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out); sizeof(outputBuffer) - fStream.avail_out);
if (result < 0) if (error < B_OK)
return result; return error;
} }
} }