Skip to content

Commit

Permalink
Revert "build fix follow up on status_t/ssize_t changes."
Browse files Browse the repository at this point in the history
This reverts commit 7202cfb.
  • Loading branch information
weinhold committed Jun 18, 2014
1 parent 94a6656 commit d5660e6
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion headers/private/package/hpkg/DataWriters.h
Expand Up @@ -71,7 +71,7 @@ class ZlibDataWriter : public AbstractDataWriter, private BDataIO {

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;
Expand Down
Expand Up @@ -39,7 +39,6 @@ struct PackageFile::IORequestOutput : BDataIO {

virtual ssize_t Write(const void* buffer, size_t size)
{
// TODO return size;
RETURN_ERROR(write_to_io_request(fRequest, buffer, size));
}

Expand Down
2 changes: 1 addition & 1 deletion src/kits/package/hpkg/BufferDataOutput.cpp
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/kits/package/hpkg/DataWriters.cpp
Expand Up @@ -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);
Expand Down

0 comments on commit d5660e6

Please sign in to comment.