[haiku-commits] haiku: hrev46854 - headers/private/package/hpkg src/kits/package/hpkg src/add-ons/kernel/file_systems/packagefs/package
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 11 Feb 2014 18:27:40 +0100 (CET)
hrev46854 adds 1 changeset to branch 'master'
old head: bcccee9322bde7f6214084119a17c41b84a16a71
new head: 7202cfb455cae89faa6e2fa3d9a9d28c3068fa6b
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7202cfb+%5Ebcccee9
----------------------------------------------------------------------------
7202cfb: build fix follow up on status_t/ssize_t changes.
* added a TODO in packagefs.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46854
Commit: 7202cfb455cae89faa6e2fa3d9a9d28c3068fa6b
URL: http://cgit.haiku-os.org/haiku/commit/?id=7202cfb
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue Feb 11 17:25:15 2014 UTC
----------------------------------------------------------------------------
4 files changed, 4 insertions(+), 3 deletions(-)
headers/private/package/hpkg/DataWriters.h | 2 +-
src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp | 1 +
src/kits/package/hpkg/BufferDataOutput.cpp | 2 +-
src/kits/package/hpkg/DataWriters.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/headers/private/package/hpkg/DataWriters.h
b/headers/private/package/hpkg/DataWriters.h
index 20e0729..1d729e5 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 62ec01f..7d4289f 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 4009ddf..f2a2f93 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 a22dcd0..a0f0a18 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);
Other related posts:
- » [haiku-commits] haiku: hrev46854 - headers/private/package/hpkg src/kits/package/hpkg src/add-ons/kernel/file_systems/packagefs/package - korli
