From 7202cfb455cae89faa6e2fa3d9a9d28c3068fa6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 11 Feb 2014 18:25:15 +0100 Subject: [PATCH] build fix follow up on status_t/ssize_t changes. * added a TODO in packagefs. --- 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, 4 insertions(+), 3 deletions(-) diff --git a/headers/private/package/hpkg/DataWriters.h b/headers/private/package/hpkg/DataWriters.h index 20e0729997..1d729e5917 100644 --- a/headers/private/package/hpkg/DataWriters.h +++ b/headers/private/package/hpkg/DataWriters.h @@ -71,7 +71,7 @@ public: private: // BDataOutput - virtual status_t Write(const void* buffer, size_t size); + virtual ssize_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 62ec01fda8..7d4289f68d 100644 --- a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp @@ -39,6 +39,7 @@ 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 4009ddf772..f2a2f930c6 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 B_OK; + return 0; 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 a22dcd01eb..a0f0a18691 100644 --- a/src/kits/package/hpkg/DataWriters.cpp +++ b/src/kits/package/hpkg/DataWriters.cpp @@ -111,7 +111,7 @@ ZlibDataWriter::WriteDataNoThrow(const void* buffer, } -status_t +ssize_t ZlibDataWriter::Write(const void* buffer, size_t size) { return fDataWriter->WriteDataNoThrow(buffer, size);