From d5660e67af347fa0624524b9662f2465934e8175 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 18 Jun 2014 21:27:10 +0200 Subject: [PATCH] Revert "build fix follow up on status_t/ssize_t changes." This reverts commit 7202cfb455cae89faa6e2fa3d9a9d28c3068fa6b. --- headers/private/package/hpkg/DataWriters.h | 2 +- .../kernel/file_systems/packagefs/package/PackageFile.cpp | 1 - src/kits/package/hpkg/BufferDataOutput.cpp | 2 +- src/kits/package/hpkg/DataWriters.cpp | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/headers/private/package/hpkg/DataWriters.h b/headers/private/package/hpkg/DataWriters.h index 1d729e5917..20e0729997 100644 --- a/headers/private/package/hpkg/DataWriters.h +++ b/headers/private/package/hpkg/DataWriters.h @@ -71,7 +71,7 @@ public: private: // BDataOutput - virtual ssize_t Write(const void* buffer, size_t size); + virtual status_t Write(const void* buffer, size_t size); private: AbstractDataWriter* fDataWriter; diff --git a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp index 7d4289f68d..62ec01fda8 100644 --- a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp @@ -39,7 +39,6 @@ public: virtual ssize_t Write(const void* buffer, size_t size) { - // TODO return size; RETURN_ERROR(write_to_io_request(fRequest, buffer, size)); } diff --git a/src/kits/package/hpkg/BufferDataOutput.cpp b/src/kits/package/hpkg/BufferDataOutput.cpp index f2a2f930c6..4009ddf772 100644 --- a/src/kits/package/hpkg/BufferDataOutput.cpp +++ b/src/kits/package/hpkg/BufferDataOutput.cpp @@ -30,7 +30,7 @@ ssize_t BBufferDataOutput::Write(const void* buffer, size_t size) { if (size == 0) - return 0; + return B_OK; if (size > fSize - fBytesWritten) return B_BAD_VALUE; diff --git a/src/kits/package/hpkg/DataWriters.cpp b/src/kits/package/hpkg/DataWriters.cpp index a0f0a18691..a22dcd01eb 100644 --- a/src/kits/package/hpkg/DataWriters.cpp +++ b/src/kits/package/hpkg/DataWriters.cpp @@ -111,7 +111,7 @@ ZlibDataWriter::WriteDataNoThrow(const void* buffer, } -ssize_t +status_t ZlibDataWriter::Write(const void* buffer, size_t size) { return fDataWriter->WriteDataNoThrow(buffer, size);