[haiku-commits] haiku: hrev47401 - src/kits/package/hpkg src/kits/shared src/kits/network/libnetapi headers/private/package/hpkg src/add-ons/kernel/file_systems/packagefs/package
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 18 Jun 2014 22:16:05 +0200 (CEST)
hrev47401 adds 15 changesets to branch 'master'
old head: cd1db87623f3e017ac865f7cdd8092dacad30f48
new head: d2d1af830b3f144937ea5e4c3f0e5b74c4c3d737
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=d2d1af8+%5Ecd1db87
----------------------------------------------------------------------------
f256bcc: Revert "Fix zlib-dependency in libnetapi."
This reverts commit 6b6ff33d607f01ac07dc1fa1305eddb9f801dc73.
f648efd: Revert "Fix zlib-dependencies of (boot & standard) packagefs."
This reverts commit 06ed40580339e21f65c24b3d210c880dcf2ec739.
f39d7f1: Revert "boot packagefs: Fix header path in zlib dependency"
This reverts commit aafc3386effbc8284b2b10db9614c46d49460a01.
a01adf3: Revert "boot packagefs: Fix zlib dependency declaration"
This reverts commit 0b565a6f51c47e4fe31b10a80d95868e0b381ea2.
cc66d3a: Revert "Style fixes, no functional changes"
This reverts commit 916382a10f471ca31087dd71b8d3ece5de9cd421.
3528fd2: Revert "Fix one more status_t/ssize_t mixup."
This reverts commit f6658d2c2c27f2df33d5db2f485551ab737331b1.
94a6656: Revert "shared kit: fixed headers dependency."
This reverts commit 675878fcfe54639ac7686de2c65166b784613337.
d5660e6: Revert "build fix follow up on status_t/ssize_t changes."
This reverts commit 7202cfb455cae89faa6e2fa3d9a9d28c3068fa6b.
4c235c7: Revert "Fix more issues detected by gcc4 compiler:"
This reverts commit 19f3bae0716c4eb7dd2a5716778560580be68071.
a05da9f: Revert "...and also fix a mismatched prototype"
This reverts commit 6555120f3b0dbc783ff5cc22a4ff0ceade53a2d8.
707f60f: Revert "Fix build."
This reverts commit 00dfae0bce7e63243180e89847df647cfa57be85.
256080b: Revert "HttpRequest: support gzip and deflate compression."
This reverts commit c3d0dd7a5e6ca1d2d43b6ebfb4c6a67300c780f7.
Conflicts:
src/kits/network/libnetapi/HttpRequest.cpp
src/kits/network/libnetapi/Jamfile
747b401: Revert "DynamicBuffer: implement BDataIO"
This reverts commit 36b1f55a1841d63f0e6487e2c62c280cb24a63c4.
5cd75b5: Revert "ZlibDecompressor: also accept gzip format"
This reverts commit 142d59ca90dc5f84899d93eef4c8515cc8d27036.
d2d1af8: Revert "Move ZlibDecompressor to libshared"
This reverts commit 9af2105d36856be60528c361edf14a263f242338.
Conflicts:
src/kits/package/Jamfile
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
43 files changed, 206 insertions(+), 241 deletions(-)
headers/build/os/package/hpkg/BufferDataOutput.h | 1 -
headers/build/os/package/hpkg/DataOutput.h | 1 +
.../private/package/hpkg/ZlibCompressionBase.h | 1 +
.../private/package/hpkg/ZlibDecompressor.h | 1 +
.../build/private/shared/ZlibCompressionBase.h | 1 -
headers/build/private/shared/ZlibDecompressor.h | 1 -
.../hpkg/{BufferDataOutput.h => DataOutput.h} | 15 ++++--
headers/os/package/hpkg/DataReader.h | 10 ++--
headers/private/net/DynamicBuffer.h | 9 ++--
headers/private/package/hpkg/DataWriters.h | 6 +--
.../package/hpkg/PackageFileHeapAccessorBase.h | 2 +-
headers/private/package/hpkg/WriterImplBase.h | 2 +-
.../hpkg}/ZlibCompressionBase.h | 15 ++++--
headers/private/package/hpkg/ZlibCompressor.h | 14 +++---
.../{shared => package/hpkg}/ZlibDecompressor.h | 22 ++++++---
.../kernel/file_systems/packagefs/Jamfile | 22 +++------
.../packagefs/package/CachedDataReader.cpp | 28 +++++------
.../packagefs/package/CachedDataReader.h | 10 ++--
.../file_systems/packagefs/package/Package.cpp | 1 +
.../packagefs/package/PackageFile.cpp | 12 ++---
src/build/libpackage/Jamfile | 6 ++-
src/build/libshared/Jamfile | 4 --
src/kits/network/libnetapi/DynamicBuffer.cpp | 16 +++---
src/kits/network/libnetapi/HttpRequest.cpp | 52 ++------------------
src/kits/network/libnetapi/Jamfile | 8 +--
src/kits/network/libnetapi/NetBuffer.cpp | 6 +--
src/kits/package/Jamfile | 4 +-
.../{BufferDataOutput.cpp => DataOutput.cpp} | 18 +++++--
src/kits/package/hpkg/DataReader.cpp | 10 ++--
src/kits/package/hpkg/DataWriters.cpp | 4 +-
src/kits/package/hpkg/PackageDataReader.cpp | 4 +-
.../package/hpkg/PackageFileHeapAccessorBase.cpp | 14 +++---
src/kits/package/hpkg/PackageReaderImpl.cpp | 4 +-
src/kits/package/hpkg/PackageWriterImpl.cpp | 2 +-
src/kits/package/hpkg/ReaderImplBase.cpp | 4 +-
.../hpkg}/ZlibCompressionBase.cpp | 10 +++-
src/kits/package/hpkg/ZlibCompressor.cpp | 12 ++---
.../hpkg}/ZlibDecompressor.cpp | 28 +++++++----
src/kits/package/hpkg/v1/PackageDataReaderV1.cpp | 18 +++----
src/kits/package/hpkg/v1/PackageReaderImplV1.cpp | 4 +-
src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp | 6 +--
src/kits/shared/Jamfile | 9 ----
.../boot/loader/file_systems/packagefs/Jamfile | 30 +++++------
############################################################################
Commit: f256bccc66e15bc713f1097a35a084e2bc218392
URL: http://cgit.haiku-os.org/haiku/commit/?id=f256bcc
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:25:35 2014 UTC
Revert "Fix zlib-dependency in libnetapi."
This reverts commit 6b6ff33d607f01ac07dc1fa1305eddb9f801dc73.
----------------------------------------------------------------------------
diff --git a/src/kits/network/libnetapi/Jamfile
b/src/kits/network/libnetapi/Jamfile
index d09e9fd..4acec98 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -14,7 +14,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
local sslSources ;
local md5Sources ;
- Includes [ FGristFiles HttpRequest.cpp ]
+ Includes [ FGristFiles $(HPKG_SOURCES) ]
: [ BuildFeatureAttribute zlib : headers ] ;
UsePrivateSystemHeaders ;
@@ -55,7 +55,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
NetworkInterface.cpp
NetworkRoster.cpp
RouteSupport.cpp
-
+
AbstractSocket.cpp
DatagramSocket.cpp
Socket.cpp
############################################################################
Commit: f648efd3d411e5d5590b586091e5cb75da896cfd
URL: http://cgit.haiku-os.org/haiku/commit/?id=f648efd
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:25:50 2014 UTC
Revert "Fix zlib-dependencies of (boot & standard) packagefs."
This reverts commit 06ed40580339e21f65c24b3d210c880dcf2ec739.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile
b/src/add-ons/kernel/file_systems/packagefs/Jamfile
index e79647a..47e4b21 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile
@@ -6,7 +6,7 @@ UsePrivateKernelHeaders ;
UsePrivateHeaders package shared storage ;
-local subDirs =
+local subDirs =
indices
nodes
package
@@ -106,8 +106,7 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1 =
Includes
[ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
- $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
- ZlibCompressionBase.cpp ZlibDecompressor.cpp ]
+ $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) ]
: [ BuildFeatureAttribute zlib : headers ] ;
local libSharedSources =
diff --git a/src/system/boot/loader/file_systems/packagefs/Jamfile
b/src/system/boot/loader/file_systems/packagefs/Jamfile
index 3b9433b..5a954a6 100644
--- a/src/system/boot/loader/file_systems/packagefs/Jamfile
+++ b/src/system/boot/loader/file_systems/packagefs/Jamfile
@@ -17,11 +17,19 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits support ] ;
-HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
+BootStaticLibrary boot_packagefs :
+ packagefs.cpp
+ PackageSettingsItem.cpp
+
+ # package kit
+
+ # package kit/hpkg
BlockBufferPool.cpp
BlockBufferPoolImpl.cpp
+ BlockBufferPoolNoLock.cpp
BufferDataOutput.cpp
BufferPool.cpp
+ PoolBuffer.cpp
DataReader.cpp
ErrorOutput.cpp
FDDataReader.cpp
@@ -33,15 +41,7 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
PackageFileHeapAccessorBase.cpp
PackageFileHeapReader.cpp
PackageReaderImpl.cpp
- PoolBuffer.cpp
ReaderImplBase.cpp
-;
-
-BootStaticLibrary boot_packagefs :
- packagefs.cpp
- PackageSettingsItem.cpp
-
- $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
# compression
DataIO.cpp
@@ -51,6 +51,8 @@ BootStaticLibrary boot_packagefs :
: -fno-pic
;
-Includes [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
- ZlibCompressionBase.cpp ZlibDecompressor.cpp ]
+Includes [
+ FGristFiles ZlibCompressionBase.cpp package/hpkg/ZlibCompressor.h
+ shared/ZlibDecompressor.h
+ ]
: [ BuildFeatureAttribute zlib : headers ] ;
############################################################################
Commit: f39d7f1096cbccdc58aabff4d206e0b10079da0b
URL: http://cgit.haiku-os.org/haiku/commit/?id=f39d7f1
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:26:05 2014 UTC
Revert "boot packagefs: Fix header path in zlib dependency"
This reverts commit aafc3386effbc8284b2b10db9614c46d49460a01.
----------------------------------------------------------------------------
diff --git a/src/system/boot/loader/file_systems/packagefs/Jamfile
b/src/system/boot/loader/file_systems/packagefs/Jamfile
index 5a954a6..042d4fc 100644
--- a/src/system/boot/loader/file_systems/packagefs/Jamfile
+++ b/src/system/boot/loader/file_systems/packagefs/Jamfile
@@ -51,8 +51,12 @@ BootStaticLibrary boot_packagefs :
: -fno-pic
;
-Includes [
- FGristFiles ZlibCompressionBase.cpp package/hpkg/ZlibCompressor.h
- shared/ZlibDecompressor.h
- ]
- : [ BuildFeatureAttribute zlib : headers ] ;
+Includes [ FGristFiles
+ PackageDataReader.cpp
+ PackageFileHeapAccessorBase.cpp
+ PackageReaderImpl.cpp
+ ReaderImplBase.cpp
+ ZlibCompressionBase.cpp
+ ZlibDecompressor.cpp
+ ] : [ BuildFeatureAttribute zlib : headers ] ;
+
############################################################################
Commit: a01adf34d67398c18a6c9e695e3eef2be0629bc6
URL: http://cgit.haiku-os.org/haiku/commit/?id=a01adf3
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:26:16 2014 UTC
Revert "boot packagefs: Fix zlib dependency declaration"
This reverts commit 0b565a6f51c47e4fe31b10a80d95868e0b381ea2.
----------------------------------------------------------------------------
diff --git a/src/system/boot/loader/file_systems/packagefs/Jamfile
b/src/system/boot/loader/file_systems/packagefs/Jamfile
index 042d4fc..7fadf51 100644
--- a/src/system/boot/loader/file_systems/packagefs/Jamfile
+++ b/src/system/boot/loader/file_systems/packagefs/Jamfile
@@ -51,12 +51,9 @@ BootStaticLibrary boot_packagefs :
: -fno-pic
;
-Includes [ FGristFiles
- PackageDataReader.cpp
- PackageFileHeapAccessorBase.cpp
- PackageReaderImpl.cpp
- ReaderImplBase.cpp
- ZlibCompressionBase.cpp
- ZlibDecompressor.cpp
- ] : [ BuildFeatureAttribute zlib : headers ] ;
+Includes [
+ FGristFiles ZlibCompressionBase.cpp
package/hpkg/ZlibCompressor.h
+ package/hpkg/ZlibDecompressor.h
+ ]
+ : [ BuildFeatureAttribute zlib : headers ] ;
############################################################################
Commit: cc66d3a0516b3d88739459f6d8b6819e6a4e61c6
URL: http://cgit.haiku-os.org/haiku/commit/?id=cc66d3a
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:26:33 2014 UTC
Revert "Style fixes, no functional changes"
This reverts commit 916382a10f471ca31087dd71b8d3ece5de9cd421.
----------------------------------------------------------------------------
diff --git a/src/kits/package/hpkg/DataReader.cpp
b/src/kits/package/hpkg/DataReader.cpp
index 97bc29f..47893bb 100644
--- a/src/kits/package/hpkg/DataReader.cpp
+++ b/src/kits/package/hpkg/DataReader.cpp
@@ -83,7 +83,7 @@ BBufferDataReader::ReadDataToOutput(off_t offset, size_t size,
return B_ERROR;
ssize_t result = output->Write((const uint8*)fData + offset, size);
- if (result >= 0)
+ if (result > B_OK)
return B_OK;
return result;
}
diff --git a/src/kits/package/hpkg/ZlibCompressor.cpp
b/src/kits/package/hpkg/ZlibCompressor.cpp
index 9e7dacc..723dbb3 100644
--- a/src/kits/package/hpkg/ZlibCompressor.cpp
+++ b/src/kits/package/hpkg/ZlibCompressor.cpp
@@ -84,7 +84,7 @@ ZlibCompressor::CompressNext(const void* input, size_t
inputSize)
if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < 0)
+ if (error < B_OK)
return error;
}
}
@@ -111,7 +111,7 @@ ZlibCompressor::Finish()
if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < 0)
+ if (error < B_OK)
return error;
}
diff --git a/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
b/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
index 6893103..48c9710 100644
--- a/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
+++ b/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
@@ -126,7 +126,7 @@ public:
// write to the output
error = output->Write(buffer->Buffer(), toRead);
- if (error < 0)
+ if (error < B_OK)
return error;
offset += toRead;
@@ -246,7 +246,7 @@ public:
size_t toCopy = std::min(size, (size_t)fChunkSize -
inChunkOffset);
error = output->Write(
(uint8*)fUncompressBuffer->Buffer() +
inChunkOffset, toCopy);
- if (error < 0)
+ if (error < B_OK)
return error;
size -= toCopy;
diff --git a/src/kits/shared/ZlibDecompressor.cpp
b/src/kits/shared/ZlibDecompressor.cpp
index 5643f3a..07e5c09 100644
--- a/src/kits/shared/ZlibDecompressor.cpp
+++ b/src/kits/shared/ZlibDecompressor.cpp
@@ -85,10 +85,10 @@ ZlibDecompressor::DecompressNext(const void* input, size_t
inputSize)
return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) {
- ssize_t result = fOutput->Write(outputBuffer,
+ status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (result < 0)
- return result;
+ if (error < B_OK)
+ return error;
}
}
@@ -114,10 +114,10 @@ ZlibDecompressor::Finish()
return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) {
- ssize_t result = fOutput->Write(outputBuffer,
+ status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (result < 0)
- return result;
+ if (error < B_OK)
+ return error;
}
}
############################################################################
Commit: 3528fd2d662e7250bbf95c1f91ec61d470c09243
URL: http://cgit.haiku-os.org/haiku/commit/?id=3528fd2
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:26:46 2014 UTC
Revert "Fix one more status_t/ssize_t mixup."
This reverts commit f6658d2c2c27f2df33d5db2f485551ab737331b1.
----------------------------------------------------------------------------
diff --git a/src/kits/shared/ZlibDecompressor.cpp
b/src/kits/shared/ZlibDecompressor.cpp
index 07e5c09..e31649c 100644
--- a/src/kits/shared/ZlibDecompressor.cpp
+++ b/src/kits/shared/ZlibDecompressor.cpp
@@ -87,7 +87,7 @@ ZlibDecompressor::DecompressNext(const void* input, size_t
inputSize)
if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < B_OK)
+ if (error != B_OK)
return error;
}
}
@@ -116,7 +116,7 @@ ZlibDecompressor::Finish()
if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < B_OK)
+ if (error != B_OK)
return error;
}
}
############################################################################
Commit: 94a66563f5cfae1e292765d11d4d4ef02f22a9a2
URL: http://cgit.haiku-os.org/haiku/commit/?id=94a6656
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:26:58 2014 UTC
Revert "shared kit: fixed headers dependency."
This reverts commit 675878fcfe54639ac7686de2c65166b784613337.
----------------------------------------------------------------------------
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index a5d29c8..6b78dc3 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -24,7 +24,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
UsePrivateSystemHeaders ;
UsePrivateHeaders kernel libroot ;
- Includes [ FGristFiles ZlibCompressionBase.cpp
ZlibDecompressor.cpp ]
+ Includes [ FGristFiles $(HPKG_SOURCES) ]
: [ BuildFeatureAttribute zlib : headers ] ;
StaticLibrary [ MultiArchDefaultGristFiles libshared.a ] :
############################################################################
Commit: d5660e67af347fa0624524b9662f2465934e8175
URL: http://cgit.haiku-os.org/haiku/commit/?id=d5660e6
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:27:10 2014 UTC
Revert "build fix follow up on status_t/ssize_t changes."
This reverts commit 7202cfb455cae89faa6e2fa3d9a9d28c3068fa6b.
----------------------------------------------------------------------------
diff --git a/headers/private/package/hpkg/DataWriters.h
b/headers/private/package/hpkg/DataWriters.h
index 1d729e5..20e0729 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 7d4289f..62ec01f 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 f2a2f93..4009ddf 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 a0f0a18..a22dcd0 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);
############################################################################
Commit: 4c235c7497ee3bc08a0bb53ae6776fe14c1f4462
URL: http://cgit.haiku-os.org/haiku/commit/?id=4c235c7
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:27:21 2014 UTC
Revert "Fix more issues detected by gcc4 compiler:"
This reverts commit 19f3bae0716c4eb7dd2a5716778560580be68071.
----------------------------------------------------------------------------
diff --git a/headers/os/package/hpkg/BufferDataOutput.h
b/headers/os/package/hpkg/BufferDataOutput.h
index 7499f98..10af41c 100644
--- a/headers/os/package/hpkg/BufferDataOutput.h
+++ b/headers/os/package/hpkg/BufferDataOutput.h
@@ -21,7 +21,7 @@ public:
size_t BytesWritten() const {
return fBytesWritten; }
- virtual ssize_t Write(const void* buffer,
size_t size);
+ virtual status_t Write(const void* buffer,
size_t size);
virtual ssize_t Read(void* buffer, size_t size)
{
return B_NOT_SUPPORTED; }
diff --git
a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
index 2a8b798..5c57865 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
@@ -40,9 +40,8 @@ struct CachedDataReader::PagesDataOutput : public BDataIO {
{
}
- virtual ssize_t Write(const void* buffer, size_t size)
+ virtual status_t Write(const void* buffer, size_t size)
{
- size_t totalSize = size;
while (size > 0) {
if (fPageCount == 0)
return B_BAD_VALUE;
@@ -51,7 +50,7 @@ struct CachedDataReader::PagesDataOutput : public BDataIO {
status_t error = vm_memcpy_to_physical(
fPages[0]->physical_page_number * B_PAGE_SIZE +
fInPageOffset,
buffer, toCopy, false);
- if (error < B_OK)
+ if (error != B_OK)
return error;
fInPageOffset += toCopy;
@@ -65,7 +64,7 @@ struct CachedDataReader::PagesDataOutput : public BDataIO {
size -= toCopy;
}
- return totalSize;
+ return B_OK;
}
virtual ssize_t Read(void* buffer, size_t size)
@@ -161,7 +160,7 @@ CachedDataReader::ReadDataToOutput(off_t offset, size_t
size,
// transfer the data of the cache line
status_t error = _ReadCacheLine(lineOffset, cacheLineEnd -
lineOffset,
offset, requestLineLength, output);
- if (error < B_OK)
+ if (error != B_OK)
return error;
offset = cacheLineEnd;
@@ -400,7 +399,7 @@ CachedDataReader::_WritePages(vm_page** pages, size_t
pagesRelativeOffset,
// unmap the page
vm_put_physical_page(address, handle);
- if (error < B_OK)
+ if (error != B_OK)
return error;
inPageOffset = 0;
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..4374084 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
@@ -37,7 +37,7 @@ public:
{
}
- virtual ssize_t Write(const void* buffer, size_t size)
+ virtual status_t Write(const void* buffer, size_t 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..8ae2543 100644
--- a/src/kits/package/hpkg/BufferDataOutput.cpp
+++ b/src/kits/package/hpkg/BufferDataOutput.cpp
@@ -26,7 +26,7 @@ BBufferDataOutput::BBufferDataOutput(void* buffer, size_t
size)
}
-ssize_t
+status_t
BBufferDataOutput::Write(const void* buffer, size_t size)
{
if (size == 0)
@@ -37,7 +37,7 @@ BBufferDataOutput::Write(const void* buffer, size_t size)
memcpy((uint8*)fBuffer + fBytesWritten, buffer, size);
fBytesWritten += size;
- return size;
+ return B_OK;
}
diff --git a/src/kits/package/hpkg/DataReader.cpp
b/src/kits/package/hpkg/DataReader.cpp
index 47893bb..eb1a81c 100644
--- a/src/kits/package/hpkg/DataReader.cpp
+++ b/src/kits/package/hpkg/DataReader.cpp
@@ -82,10 +82,7 @@ BBufferDataReader::ReadDataToOutput(off_t offset, size_t
size,
if (size > fSize || offset > (off_t)fSize - (off_t)size)
return B_ERROR;
- ssize_t result = output->Write((const uint8*)fData + offset, size);
- if (result > B_OK)
- return B_OK;
- return result;
+ return output->Write((const uint8*)fData + offset, size);
}
diff --git a/src/kits/package/hpkg/PackageFileHeapAccessorBase.cpp
b/src/kits/package/hpkg/PackageFileHeapAccessorBase.cpp
index 447c375..3ffa2a8 100644
--- a/src/kits/package/hpkg/PackageFileHeapAccessorBase.cpp
+++ b/src/kits/package/hpkg/PackageFileHeapAccessorBase.cpp
@@ -176,7 +176,7 @@ PackageFileHeapAccessorBase::ReadDataToOutput(off_t offset,
size_t size,
// harm.
error = output->Write((char*)uncompressedDataBuffer +
inChunkOffset,
toWrite);
- if (error < B_OK)
+ if (error != B_OK)
return error;
remainingBytes -= toWrite;
diff --git a/src/kits/package/hpkg/ZlibCompressor.cpp
b/src/kits/package/hpkg/ZlibCompressor.cpp
index 723dbb3..b9e6e6f 100644
--- a/src/kits/package/hpkg/ZlibCompressor.cpp
+++ b/src/kits/package/hpkg/ZlibCompressor.cpp
@@ -84,7 +84,7 @@ ZlibCompressor::CompressNext(const void* input, size_t
inputSize)
if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < B_OK)
+ if (error != B_OK)
return error;
}
}
@@ -111,7 +111,7 @@ ZlibCompressor::Finish()
if (fStream.avail_out < sizeof(outputBuffer)) {
status_t error = fOutput->Write(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
- if (error < B_OK)
+ if (error != B_OK)
return error;
}
diff --git a/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
b/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
index 48c9710..e8d47ed 100644
--- a/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
+++ b/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
@@ -126,7 +126,7 @@ public:
// write to the output
error = output->Write(buffer->Buffer(), toRead);
- if (error < B_OK)
+ if (error != B_OK)
return error;
offset += toRead;
@@ -246,7 +246,7 @@ public:
size_t toCopy = std::min(size, (size_t)fChunkSize -
inChunkOffset);
error = output->Write(
(uint8*)fUncompressBuffer->Buffer() +
inChunkOffset, toCopy);
- if (error < B_OK)
+ if (error != B_OK)
return error;
size -= toCopy;
############################################################################
Commit: a05da9f4b2c6548ad36e0ad711dae672affbbf27
URL: http://cgit.haiku-os.org/haiku/commit/?id=a05da9f
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:27:34 2014 UTC
Revert "...and also fix a mismatched prototype"
This reverts commit 6555120f3b0dbc783ff5cc22a4ff0ceade53a2d8.
----------------------------------------------------------------------------
diff --git a/headers/private/net/DynamicBuffer.h
b/headers/private/net/DynamicBuffer.h
index 4dfb17b..58a49d9 100644
--- a/headers/private/net/DynamicBuffer.h
+++ b/headers/private/net/DynamicBuffer.h
@@ -26,7 +26,7 @@ public:
// Insert data at the end of the buffer. The buffer will be increased to
// accomodate the data if needed.
- ssize_t Write(const void* data, size_t size);
+ status_t Write(const void* data, size_t size);
// Remove data from the start of the buffer. Move the buffer start
// pointer to point to the data following it.
diff --git a/src/kits/network/libnetapi/DynamicBuffer.cpp
b/src/kits/network/libnetapi/DynamicBuffer.cpp
index 9f336df..75f4a46 100644
--- a/src/kits/network/libnetapi/DynamicBuffer.cpp
+++ b/src/kits/network/libnetapi/DynamicBuffer.cpp
@@ -67,7 +67,7 @@ DynamicBuffer::InitCheck() const
}
-ssize_t
+status_t
DynamicBuffer::Write(const void* data, size_t size)
{
if (fInit != B_OK)
@@ -80,7 +80,7 @@ DynamicBuffer::Write(const void* data, size_t size)
memcpy(fBuffer + fDataEnd, data, size);
fDataEnd += size;
- return size;
+ return B_OK;
}
############################################################################
Commit: 707f60f4e9c66441a2bc3e2ef0024c4c0e59a41c
URL: http://cgit.haiku-os.org/haiku/commit/?id=707f60f
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:27:47 2014 UTC
Revert "Fix build."
This reverts commit 00dfae0bce7e63243180e89847df647cfa57be85.
----------------------------------------------------------------------------
diff --git a/headers/build/os/package/hpkg/BufferDataOutput.h
b/headers/build/os/package/hpkg/BufferDataOutput.h
index ec23898..565ceb4 100644
--- a/headers/build/os/package/hpkg/BufferDataOutput.h
+++ b/headers/build/os/package/hpkg/BufferDataOutput.h
@@ -1 +1 @@
-#include <../os/package/hpkg/BufferDataOutput.h>
+#include <../os/package/hpkg/DataOutput.h>
diff --git
a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
index 5c57865..ac7c246 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
@@ -8,7 +8,7 @@
#include <algorithm>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <util/AutoLock.h>
#include <vm/VMCache.h>
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 4374084..0db672d 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
@@ -14,7 +14,7 @@
#include <AutoDeleter.h>
#include <util/AutoLock.h>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/DataReader.h>
#include <package/hpkg/PackageDataReader.h>
############################################################################
Commit: 256080b112e417fc4fd2f3f9fcb23485e1b23b42
URL: http://cgit.haiku-os.org/haiku/commit/?id=256080b
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:39:09 2014 UTC
Revert "HttpRequest: support gzip and deflate compression."
This reverts commit c3d0dd7a5e6ca1d2d43b6ebfb4c6a67300c780f7.
Conflicts:
src/kits/network/libnetapi/HttpRequest.cpp
src/kits/network/libnetapi/Jamfile
----------------------------------------------------------------------------
diff --git a/src/kits/network/libnetapi/HttpRequest.cpp
b/src/kits/network/libnetapi/HttpRequest.cpp
index dcb396f..4f3ac8e 100644
--- a/src/kits/network/libnetapi/HttpRequest.cpp
+++ b/src/kits/network/libnetapi/HttpRequest.cpp
@@ -1,11 +1,10 @@
/*
- * Copyright 2010-2014 Haiku Inc. All rights reserved.
+ * Copyright 2010-2013 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Christophe Huriaux, c.huriaux@xxxxxxxxx
* Niels Sascha Reedijk, niels.reedijk@xxxxxxxxx
- * Adrien Destugues, pulkomandy@xxxxxxxxxxxxx
*/
@@ -19,12 +18,10 @@
#include <new>
#include <Debug.h>
-#include <DynamicBuffer.h>
#include <File.h>
#include <Socket.h>
#include <SecureSocket.h>
#include <StackOrHeapArray.h>
-#include <ZlibDecompressor.h>
static const int32 kHttpBufferSize = 4096;
@@ -437,8 +434,6 @@ BHttpRequest::_ResolveHostName()
else
port = fSSL ? 443 : 80;
- // FIXME stop forcing AF_INET, when BNetworkAddress stops giving IPv6
- // addresses when there isn't an IPv6 link available.
fRemoteAddr = BNetworkAddress(AF_INET, fUrl.Host(), port);
if (fRemoteAddr.InitCheck() != B_OK)
@@ -575,17 +570,13 @@ BHttpRequest::_MakeRequest()
bool receiveEnd = false;
bool parseEnd = false;
bool readByChunks = false;
- bool decompress = false;
status_t readError = B_OK;
ssize_t bytesRead = 0;
ssize_t bytesReceived = 0;
ssize_t bytesTotal = 0;
- off_t bytesUnpacked = 0;
char* inputTempBuffer = new(std::nothrow) char[kHttpBufferSize];
ssize_t inputTempSize = kHttpBufferSize;
ssize_t chunkSize = -1;
- DynamicBuffer decompressorStorage;
- BPrivate::ZlibDecompressor decompressor(&decompressorStorage);
while (!fQuit && !(receiveEnd && parseEnd)) {
if (!receiveEnd) {
@@ -634,13 +625,6 @@ BHttpRequest::_MakeRequest()
if (BString(fHeaders["Transfer-Encoding"]) ==
"chunked")
readByChunks = true;
- BString
contentEncoding(fHeaders["Content-Encoding"]);
- if (contentEncoding == "gzip"
- || contentEncoding ==
"deflate") {
- decompress = true;
- decompressor.Init();
- }
-
int32 index =
fHeaders.HasHeader("Content-Length");
if (index != B_ERROR)
bytesTotal =
atoi(fHeaders.HeaderAt(index).Value());
@@ -727,40 +711,14 @@ BHttpRequest::_MakeRequest()
bytesReceived += bytesRead;
if (fListener != NULL) {
- if (decompress) {
-
decompressor.DecompressNext(inputTempBuffer,
- bytesRead);
- ssize_t size =
decompressorStorage.Size();
- BStackOrHeapArray<char, 4096>
buffer(size);
- size =
decompressorStorage.Read(buffer, size);
- if (size > 0) {
-
fListener->DataReceived(this, buffer, bytesUnpacked,
- size);
- bytesUnpacked += size;
- }
- } else {
- fListener->DataReceived(this,
inputTempBuffer,
- bytesReceived -
bytesRead, bytesRead);
- }
+ fListener->DataReceived(this,
inputTempBuffer,
+ bytesReceived - bytesRead,
bytesRead);
fListener->DownloadProgress(this,
bytesReceived,
bytesTotal);
}
- if (bytesTotal > 0 && bytesReceived >=
bytesTotal) {
+ if (bytesTotal > 0 && bytesReceived >=
bytesTotal)
receiveEnd = true;
-
- if (decompress) {
- decompressor.Finish();
- ssize_t size =
decompressorStorage.Size();
- BStackOrHeapArray<char, 4096>
buffer(size);
- size =
decompressorStorage.Read(buffer, size);
- if (fListener != NULL && size >
0) {
-
fListener->DataReceived(this, buffer,
- bytesUnpacked,
size);
- bytesUnpacked += size;
- }
- }
- }
}
}
@@ -890,7 +848,7 @@ BHttpRequest::_SendHeaders()
fOutputHeaders.AddHeader("Host", Url().Host());
fOutputHeaders.AddHeader("Accept", "*/*");
- fOutputHeaders.AddHeader("Accept-Encoding", "gzip,deflate");
+ fOutputHeaders.AddHeader("Accept-Encoding", "identity");
// Allow the remote server to send dynamic content by
chunks
// rather than waiting for the full content to be
generated and
// sending us data.
diff --git a/src/kits/network/libnetapi/Jamfile
b/src/kits/network/libnetapi/Jamfile
index 4acec98..39c7908 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -9,14 +9,9 @@ UseHeaders [ FDirName $(HAIKU_TOP) src libs compat
freebsd_wlan ] : true ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
- UseBuildFeatureHeaders zlib ;
-
local sslSources ;
local md5Sources ;
- Includes [ FGristFiles $(HPKG_SOURCES) ]
- : [ BuildFeatureAttribute zlib : headers ] ;
-
UsePrivateSystemHeaders ;
if [ FIsBuildFeatureEnabled openssl ] {
@@ -92,7 +87,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
:
be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSTDC++)
$(TARGET_LIBSUPC++)
[ BuildFeatureAttribute openssl : libraries ]
- [ BuildFeatureAttribute zlib : library ]
[ MultiArchDefaultGristFiles libshared.a ]
;
}
############################################################################
Commit: 747b401e875f19d83508cc39176f4c263182c515
URL: http://cgit.haiku-os.org/haiku/commit/?id=747b401
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:39:34 2014 UTC
Revert "DynamicBuffer: implement BDataIO"
This reverts commit 36b1f55a1841d63f0e6487e2c62c280cb24a63c4.
----------------------------------------------------------------------------
diff --git a/headers/private/net/DynamicBuffer.h
b/headers/private/net/DynamicBuffer.h
index 58a49d9..183f88b 100644
--- a/headers/private/net/DynamicBuffer.h
+++ b/headers/private/net/DynamicBuffer.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2014, Haiku, Inc. All Rights Reserved.
+ * Copyright 2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -9,11 +9,10 @@
#ifndef _DYNAMIC_BUFFER_H
#define _DYNAMIC_BUFFER_H
-#include <DataIO.h>
#include <SupportDefs.h>
-class DynamicBuffer : public BDataIO {
+class DynamicBuffer {
public:
DynamicBuffer(size_t initialSize = 0);
~DynamicBuffer();
@@ -26,11 +25,11 @@ public:
// Insert data at the end of the buffer. The buffer will be increased to
// accomodate the data if needed.
- status_t Write(const void* data, size_t size);
+ status_t Insert(const void* data, size_t size);
// Remove data from the start of the buffer. Move the buffer start
// pointer to point to the data following it.
- ssize_t Read(void* data, size_t size);
+ status_t Remove(void* data, size_t size);
// Return a pointer to the underlying buffer. Note this will not
// necessarily be a pointer to the start of the allocated memory as the
diff --git a/src/kits/network/libnetapi/DynamicBuffer.cpp
b/src/kits/network/libnetapi/DynamicBuffer.cpp
index 75f4a46..1c63eca 100644
--- a/src/kits/network/libnetapi/DynamicBuffer.cpp
+++ b/src/kits/network/libnetapi/DynamicBuffer.cpp
@@ -68,7 +68,7 @@ DynamicBuffer::InitCheck() const
status_t
-DynamicBuffer::Write(const void* data, size_t size)
+DynamicBuffer::Insert(const void* data, size_t size)
{
if (fInit != B_OK)
return fInit;
@@ -84,14 +84,14 @@ DynamicBuffer::Write(const void* data, size_t size)
}
-ssize_t
-DynamicBuffer::Read(void* data, size_t size)
+status_t
+DynamicBuffer::Remove(void* data, size_t size)
{
if (fInit != B_OK)
return fInit;
- if (size > Size())
- size = Size();
+ if (fDataStart + size > fDataEnd)
+ return B_BUFFER_OVERFLOW;
memcpy(data, fBuffer + fDataStart, size);
fDataStart += size;
@@ -99,7 +99,7 @@ DynamicBuffer::Read(void* data, size_t size)
if (fDataStart == fDataEnd)
fDataStart = fDataEnd = 0;
- return size;
+ return B_OK;
}
diff --git a/src/kits/network/libnetapi/NetBuffer.cpp
b/src/kits/network/libnetapi/NetBuffer.cpp
index c1ccb2b..d2a0911 100644
--- a/src/kits/network/libnetapi/NetBuffer.cpp
+++ b/src/kits/network/libnetapi/NetBuffer.cpp
@@ -54,7 +54,7 @@ BNetBuffer::BNetBuffer(BMessage* archive) :
&bufferSize) == B_OK) {
fImpl = new (std::nothrow) DynamicBuffer(bufferSize);
if (fImpl != NULL) {
- status_t result = fImpl->Write(bufferPtr, bufferSize);
+ status_t result = fImpl->Insert(bufferPtr, bufferSize);
if (result == B_OK)
fInit = fImpl->InitCheck();
else
@@ -185,7 +185,7 @@ BNetBuffer::AppendString(const char* data)
status_t
BNetBuffer::AppendData(const void* data, size_t size)
{
- return fImpl->Write(data, size);
+ return fImpl->Insert(data, size);
}
@@ -332,7 +332,7 @@ BNetBuffer::RemoveString(char* data, size_t size)
status_t
BNetBuffer::RemoveData(void* data, size_t size)
{
- return fImpl->Read(data, size);
+ return fImpl->Remove(data, size);
}
############################################################################
Commit: 5cd75b56a8545e2ca7cb4ae48bdfc43abd675292
URL: http://cgit.haiku-os.org/haiku/commit/?id=5cd75b5
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:39:51 2014 UTC
Revert "ZlibDecompressor: also accept gzip format"
This reverts commit 142d59ca90dc5f84899d93eef4c8515cc8d27036.
----------------------------------------------------------------------------
diff --git a/src/kits/shared/ZlibDecompressor.cpp
b/src/kits/shared/ZlibDecompressor.cpp
index e31649c..17552a8 100644
--- a/src/kits/shared/ZlibDecompressor.cpp
+++ b/src/kits/shared/ZlibDecompressor.cpp
@@ -54,7 +54,7 @@ ZlibDecompressor::Init()
fStream.adler = 0;
fStream.reserved = 0;
- int zlibError = inflateInit2(&fStream, 32 + MAX_WBITS);
+ int zlibError = inflateInit(&fStream);
if (zlibError != Z_OK)
return TranslateZlibError(zlibError);
############################################################################
Revision: hrev47401
Commit: d2d1af830b3f144937ea5e4c3f0e5b74c4c3d737
URL: http://cgit.haiku-os.org/haiku/commit/?id=d2d1af8
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Wed Jun 18 19:42:40 2014 UTC
Revert "Move ZlibDecompressor to libshared"
This reverts commit 9af2105d36856be60528c361edf14a263f242338.
Conflicts:
src/kits/package/Jamfile
----------------------------------------------------------------------------
diff --git a/headers/build/os/package/hpkg/BufferDataOutput.h
b/headers/build/os/package/hpkg/DataOutput.h
similarity index 100%
rename from headers/build/os/package/hpkg/BufferDataOutput.h
rename to headers/build/os/package/hpkg/DataOutput.h
diff --git a/headers/build/private/package/hpkg/ZlibCompressionBase.h
b/headers/build/private/package/hpkg/ZlibCompressionBase.h
new file mode 100644
index 0000000..052cfd0
--- /dev/null
+++ b/headers/build/private/package/hpkg/ZlibCompressionBase.h
@@ -0,0 +1 @@
+#include <../private/package/hpkg/ZlibCompressionBase.h>
diff --git a/headers/build/private/package/hpkg/ZlibDecompressor.h
b/headers/build/private/package/hpkg/ZlibDecompressor.h
new file mode 100644
index 0000000..698aca6
--- /dev/null
+++ b/headers/build/private/package/hpkg/ZlibDecompressor.h
@@ -0,0 +1 @@
+#include <../private/package/hpkg/ZlibDecompressor.h>
diff --git a/headers/build/private/shared/ZlibCompressionBase.h
b/headers/build/private/shared/ZlibCompressionBase.h
deleted file mode 100644
index 09353da..0000000
--- a/headers/build/private/shared/ZlibCompressionBase.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <../private/shared/ZlibCompressionBase.h>
diff --git a/headers/build/private/shared/ZlibDecompressor.h
b/headers/build/private/shared/ZlibDecompressor.h
deleted file mode 100644
index a170614..0000000
--- a/headers/build/private/shared/ZlibDecompressor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <../private/shared/ZlibDecompressor.h>
diff --git a/headers/os/package/hpkg/BufferDataOutput.h
b/headers/os/package/hpkg/DataOutput.h
similarity index 69%
rename from headers/os/package/hpkg/BufferDataOutput.h
rename to headers/os/package/hpkg/DataOutput.h
index 10af41c..290937a 100644
--- a/headers/os/package/hpkg/BufferDataOutput.h
+++ b/headers/os/package/hpkg/DataOutput.h
@@ -6,7 +6,6 @@
#define _PACKAGE__HPKG__DATA_OUTPUT_H_
-#include <DataIO.h>
#include <SupportDefs.h>
@@ -15,15 +14,21 @@ namespace BPackageKit {
namespace BHPKG {
-class BBufferDataOutput : public BDataIO {
+class BDataOutput {
+public:
+ virtual ~BDataOutput();
+
+ virtual status_t WriteData(const void* buffer,
size_t size) = 0;
+};
+
+
+class BBufferDataOutput : public BDataOutput {
public:
BBufferDataOutput(void* buffer, size_t size);
size_t BytesWritten() const {
return fBytesWritten; }
- virtual status_t Write(const void* buffer,
size_t size);
- virtual ssize_t Read(void* buffer, size_t size)
- {
return B_NOT_SUPPORTED; }
+ virtual status_t WriteData(const void* buffer,
size_t size);
private:
void* fBuffer;
diff --git a/headers/os/package/hpkg/DataReader.h
b/headers/os/package/hpkg/DataReader.h
index 6d103ec..2590415 100644
--- a/headers/os/package/hpkg/DataReader.h
+++ b/headers/os/package/hpkg/DataReader.h
@@ -9,14 +9,14 @@
#include <SupportDefs.h>
-class BDataIO;
-
-
namespace BPackageKit {
namespace BHPKG {
+class BDataOutput;
+
+
class BDataReader {
public:
virtual ~BDataReader();
@@ -33,7 +33,7 @@ public:
virtual status_t ReadData(off_t offset, void*
buffer,
size_t
size);
virtual status_t ReadDataToOutput(off_t offset,
size_t size,
-
BDataIO* output) = 0;
+
BDataOutput* output) = 0;
};
@@ -73,7 +73,7 @@ public:
virtual status_t ReadData(off_t offset, void*
buffer,
size_t
size);
virtual status_t ReadDataToOutput(off_t offset,
size_t size,
-
BDataIO* output);
+
BDataOutput* output);
private:
const void* fData;
diff --git a/headers/private/package/hpkg/DataWriters.h
b/headers/private/package/hpkg/DataWriters.h
index 20e0729..26f67cf 100644
--- a/headers/private/package/hpkg/DataWriters.h
+++ b/headers/private/package/hpkg/DataWriters.h
@@ -7,7 +7,7 @@
#define _PACKAGE__HPKG__PRIVATE__DATA_WRITERS_H_
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/ZlibCompressor.h>
@@ -59,7 +59,7 @@ private:
};
-class ZlibDataWriter : public AbstractDataWriter, private BDataIO {
+class ZlibDataWriter : public AbstractDataWriter, private BDataOutput {
public:
ZlibDataWriter(AbstractDataWriter* dataWriter);
@@ -71,7 +71,7 @@ public:
private:
// BDataOutput
- virtual status_t Write(const void* buffer,
size_t size);
+ virtual status_t WriteData(const void* buffer,
size_t size);
private:
AbstractDataWriter* fDataWriter;
diff --git a/headers/private/package/hpkg/PackageFileHeapAccessorBase.h
b/headers/private/package/hpkg/PackageFileHeapAccessorBase.h
index 84ce06e..47ae47f 100644
--- a/headers/private/package/hpkg/PackageFileHeapAccessorBase.h
+++ b/headers/private/package/hpkg/PackageFileHeapAccessorBase.h
@@ -49,7 +49,7 @@ public:
// BAbstractBufferedDataReader
virtual status_t ReadDataToOutput(off_t offset,
size_t size,
-
BDataIO* output);
+
BDataOutput* output);
public:
static const size_t kChunkSize = 64 * 1024;
diff --git a/headers/private/package/hpkg/WriterImplBase.h
b/headers/private/package/hpkg/WriterImplBase.h
index 66c6e0a..0686335 100644
--- a/headers/private/package/hpkg/WriterImplBase.h
+++ b/headers/private/package/hpkg/WriterImplBase.h
@@ -10,7 +10,7 @@
#include <package/hpkg/HPKGDefsPrivate.h>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/DataWriters.h>
#include <package/hpkg/PackageWriter.h>
#include <package/hpkg/Strings.h>
diff --git a/headers/private/shared/ZlibCompressionBase.h
b/headers/private/package/hpkg/ZlibCompressionBase.h
similarity index 50%
rename from headers/private/shared/ZlibCompressionBase.h
rename to headers/private/package/hpkg/ZlibCompressionBase.h
index 2ebfbb0..786e579 100644
--- a/headers/private/shared/ZlibCompressionBase.h
+++ b/headers/private/package/hpkg/ZlibCompressionBase.h
@@ -2,13 +2,17 @@
* Copyright 2009, Ingo Weinhold, ingo_weinhold@xxxxxx.
* Distributed under the terms of the MIT License.
*/
-#ifndef _PRIVATE__ZLIB_COMPRESSION_BASE_H_
-#define _PRIVATE__ZLIB_COMPRESSION_BASE_H_
+#ifndef _PACKAGE__HPKG__PRIVATE__ZLIB_COMPRESSION_BASE_H_
+#define _PACKAGE__HPKG__PRIVATE__ZLIB_COMPRESSION_BASE_H_
#include <SupportDefs.h>
+namespace BPackageKit {
+
+namespace BHPKG {
+
namespace BPrivate {
@@ -20,4 +24,9 @@ public:
} // namespace BPrivate
-#endif // _PRIVATE__ZLIB_COMPRESSION_BASE_H_
+} // namespace BHPKG
+
+} // namespace BPackageKit
+
+
+#endif // _PACKAGE__HPKG__PRIVATE__ZLIB_COMPRESSION_BASE_H_
diff --git a/headers/private/package/hpkg/ZlibCompressor.h
b/headers/private/package/hpkg/ZlibCompressor.h
index 9d73f2b..4f6dd14 100644
--- a/headers/private/package/hpkg/ZlibCompressor.h
+++ b/headers/private/package/hpkg/ZlibCompressor.h
@@ -8,10 +8,7 @@
#include <zlib.h>
-#include <ZlibCompressionBase.h>
-
-
-class BDataIO;
+#include <package/hpkg/ZlibCompressionBase.h>
namespace BPackageKit {
@@ -19,12 +16,15 @@ namespace BPackageKit {
namespace BHPKG {
+class BDataOutput;
+
+
namespace BPrivate {
-class ZlibCompressor : public ::BPrivate::ZlibCompressionBase {
+class ZlibCompressor : public ZlibCompressionBase {
public:
-
ZlibCompressor(BDataIO* output);
+
ZlibCompressor(BDataOutput* output);
~ZlibCompressor();
status_t Init(int
compressionLevel = Z_BEST_COMPRESSION);
@@ -39,7 +39,7 @@ public:
private:
z_stream fStream;
- BDataIO* fOutput;
+ BDataOutput* fOutput;
bool fStreamInitialized;
};
diff --git a/headers/private/shared/ZlibDecompressor.h
b/headers/private/package/hpkg/ZlibDecompressor.h
similarity index 67%
rename from headers/private/shared/ZlibDecompressor.h
rename to headers/private/package/hpkg/ZlibDecompressor.h
index 2d1efab..8d4556b 100644
--- a/headers/private/shared/ZlibDecompressor.h
+++ b/headers/private/package/hpkg/ZlibDecompressor.h
@@ -2,16 +2,21 @@
* Copyright 2009, Ingo Weinhold, ingo_weinhold@xxxxxx.
* Distributed under the terms of the MIT License.
*/
-#ifndef _PRIVATE__ZLIB_DECOMPRESSOR_H_
-#define _PRIVATE__ZLIB_DECOMPRESSOR_H_
+#ifndef _PACKAGE__HPKG__PRIVATE__ZLIB_DECOMPRESSOR_H_
+#define _PACKAGE__HPKG__PRIVATE__ZLIB_DECOMPRESSOR_H_
#include <zlib.h>
-#include <ZlibCompressionBase.h>
+#include <package/hpkg/ZlibCompressionBase.h>
-class BDataIO;
+namespace BPackageKit {
+
+namespace BHPKG {
+
+
+class BDataOutput;
namespace BPrivate {
@@ -19,7 +24,7 @@ namespace BPrivate {
class ZlibDecompressor : public ZlibCompressionBase {
public:
-
ZlibDecompressor(BDataIO* output);
+
ZlibDecompressor(BDataOutput* output);
~ZlibDecompressor();
status_t Init();
@@ -34,7 +39,7 @@ public:
private:
z_stream fStream;
- BDataIO* fOutput;
+ BDataOutput* fOutput;
bool fStreamInitialized;
bool fFinished;
};
@@ -42,4 +47,9 @@ private:
} // namespace BPrivate
+} // namespace BHPKG
+
+} // namespace BPackageKit
+
+
#endif // _PACKAGE__HPKG__PRIVATE__ZLIB_DECOMPRESSOR_H_
diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile
b/src/add-ons/kernel/file_systems/packagefs/Jamfile
index 47e4b21..53907f2 100644
--- a/src/add-ons/kernel/file_systems/packagefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/packagefs/Jamfile
@@ -75,8 +75,8 @@ HAIKU_PACKAGE_FS_SHARED_SOURCES =
HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
BlockBufferPoolImpl.cpp
- BufferDataOutput.cpp
BufferPool.cpp
+ DataOutput.cpp
DataReader.cpp
ErrorOutput.cpp
FDDataReader.cpp
@@ -91,6 +91,10 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
PackageFileHeapReader.cpp
PackageReaderImpl.cpp
ReaderImplBase.cpp
+
+ # compression
+ ZlibCompressionBase.cpp
+ ZlibDecompressor.cpp
;
HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1 =
@@ -111,14 +115,6 @@ Includes
local libSharedSources =
NaturalCompare.cpp
-
- # compression
- ZlibCompressionBase.cpp
- ZlibDecompressor.cpp
-;
-
-local supportKitSources =
- DataIO.cpp
;
@@ -129,7 +125,6 @@ KernelAddon packagefs
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
$(libSharedSources)
- $(supportKitSources)
: $(TARGET_KERNEL_LIBSUPC++) kernel_libz.a
;
@@ -143,5 +138,3 @@ SEARCH on [ FGristFiles
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) ]
+= [ FDirName $(HAIKU_TOP) src kits package hpkg v1 ] ;
SEARCH on [ FGristFiles $(libSharedSources) ]
+= [ FDirName $(HAIKU_TOP) src kits shared ] ;
-SEARCH on [ FGristFiles $(supportKitSources) ]
- += [ FDirName $(HAIKU_TOP) src kits support ] ;
diff --git
a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
index ac7c246..fa6f3fc 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
@@ -31,7 +31,7 @@ page_physical_number_less(const vm_page* a, const vm_page* b)
// #pragma mark - PagesDataOutput
-struct CachedDataReader::PagesDataOutput : public BDataIO {
+struct CachedDataReader::PagesDataOutput : public BDataOutput {
PagesDataOutput(vm_page** pages, size_t pageCount)
:
fPages(pages),
@@ -40,7 +40,7 @@ struct CachedDataReader::PagesDataOutput : public BDataIO {
{
}
- virtual status_t Write(const void* buffer, size_t size)
+ virtual status_t WriteData(const void* buffer, size_t size)
{
while (size > 0) {
if (fPageCount == 0)
@@ -67,11 +67,6 @@ struct CachedDataReader::PagesDataOutput : public BDataIO {
return B_OK;
}
- virtual ssize_t Read(void* buffer, size_t size)
- {
- return B_NOT_SUPPORTED;
- }
-
private:
vm_page** fPages;
size_t fPageCount;
@@ -137,7 +132,7 @@ CachedDataReader::ReadData(off_t offset, void* buffer,
size_t size)
status_t
CachedDataReader::ReadDataToOutput(off_t offset, size_t size,
- BDataIO* output)
+ BDataOutput* output)
{
if (offset > fCache->virtual_end
|| (off_t)size > fCache->virtual_end - offset) {
@@ -173,7 +168,7 @@ CachedDataReader::ReadDataToOutput(off_t offset, size_t
size,
status_t
CachedDataReader::_ReadCacheLine(off_t lineOffset, size_t lineSize,
- off_t requestOffset, size_t requestLength, BDataIO* output)
+ off_t requestOffset, size_t requestLength, BDataOutput* output)
{
PRINT("CachedDataReader::_ReadCacheLine(%" B_PRIdOFF ", %zu, %"
B_PRIdOFF
", %zu, %p\n", lineOffset, lineSize, requestOffset,
requestLength,
@@ -371,7 +366,7 @@ CachedDataReader::_CachePages(vm_page** pages, size_t
firstPage,
*/
status_t
CachedDataReader::_WritePages(vm_page** pages, size_t pagesRelativeOffset,
- size_t requestLength, BDataIO* output)
+ size_t requestLength, BDataOutput* output)
{
PRINT("%p->CachedDataReader::_WritePages(%" B_PRIuSIZE ", %" B_PRIuSIZE
", %p)\n", this, pagesRelativeOffset, requestLength, output);
@@ -394,7 +389,7 @@ CachedDataReader::_WritePages(vm_page** pages, size_t
pagesRelativeOffset,
// write the page's data
size_t toCopy = std::min(B_PAGE_SIZE - inPageOffset,
requestLength);
- error = output->Write((uint8*)(address + inPageOffset), toCopy);
+ error = output->WriteData((uint8*)(address + inPageOffset),
toCopy);
// unmap the page
vm_put_physical_page(address, handle);
diff --git
a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.h
b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.h
index 847e16d..7cba87c 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.h
+++ b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.h
@@ -15,12 +15,10 @@
using BPackageKit::BHPKG::BAbstractBufferedDataReader;
+using BPackageKit::BHPKG::BDataOutput;
using BPackageKit::BHPKG::BDataReader;
-class BDataIO;
-
-
class CachedDataReader : public BAbstractBufferedDataReader {
public:
CachedDataReader();
@@ -32,7 +30,7 @@ public:
virtual status_t ReadData(off_t offset, void*
buffer,
size_t
size);
virtual status_t ReadDataToOutput(off_t offset,
size_t size,
-
BDataIO* output);
+
BDataOutput* output);
private:
class CacheLineLocker
@@ -123,7 +121,7 @@ private:
private:
status_t _ReadCacheLine(off_t
lineOffset,
size_t
lineSize, off_t requestOffset,
- size_t
requestLength, BDataIO* output);
+ size_t
requestLength, BDataOutput* output);
void _DiscardPages(vm_page**
pages, size_t firstPage,
size_t
pageCount);
@@ -131,7 +129,7 @@ private:
size_t
pageCount);
status_t _WritePages(vm_page**
pages,
size_t
pagesRelativeOffset,
- size_t
requestLength, BDataIO* output);
+ size_t
requestLength, BDataOutput* output);
status_t
_ReadIntoPages(vm_page** pages,
size_t
firstPage, size_t pageCount);
diff --git a/src/add-ons/kernel/file_systems/packagefs/package/Package.cpp
b/src/add-ons/kernel/file_systems/packagefs/package/Package.cpp
index eb0847e..dd84622 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/Package.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/Package.cpp
@@ -39,6 +39,7 @@
using namespace BPackageKit;
+using BPackageKit::BHPKG::BDataOutput;
using BPackageKit::BHPKG::BErrorOutput;
using BPackageKit::BHPKG::BFDDataReader;
using BPackageKit::BHPKG::BPackageInfoAttributeValue;
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 0db672d..01abec7 100644
--- a/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/package/PackageFile.cpp
@@ -29,7 +29,7 @@ using namespace BPackageKit::BHPKG;
// #pragma mark - DataAccessor
-struct PackageFile::IORequestOutput : BDataIO {
+struct PackageFile::IORequestOutput : BDataOutput {
public:
IORequestOutput(io_request* request)
:
@@ -37,16 +37,11 @@ public:
{
}
- virtual status_t Write(const void* buffer, size_t size)
+ virtual status_t WriteData(const void* buffer, size_t size)
{
RETURN_ERROR(write_to_io_request(fRequest, buffer, size));
}
- virtual ssize_t Read(void* buffer, size_t size)
- {
- return B_NOT_SUPPORTED;
- }
-
private:
io_request* fRequest;
};
diff --git a/src/build/libpackage/Jamfile b/src/build/libpackage/Jamfile
index 6814f3c..ca37f93 100644
--- a/src/build/libpackage/Jamfile
+++ b/src/build/libpackage/Jamfile
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src build libpackage ;
-UsePrivateBuildHeaders kernel package shared storage support ;
+UsePrivateBuildHeaders kernel package shared storage ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
@@ -33,9 +33,9 @@ HPKG_SOURCES =
BlockBufferPool.cpp
BlockBufferPoolImpl.cpp
BlockBufferPoolNoLock.cpp
- BufferDataOutput.cpp
BufferPool.cpp
PoolBuffer.cpp
+ DataOutput.cpp
DataReader.cpp
DataWriters.cpp
ErrorOutput.cpp
@@ -77,7 +77,9 @@ HPKG_SOURCES =
ReaderImplBaseV1.cpp
# compression
+ ZlibCompressionBase.cpp
ZlibCompressor.cpp
+ ZlibDecompressor.cpp
;
# TODO: remove this hack once gcc2 has -iquote implemented
diff --git a/src/build/libshared/Jamfile b/src/build/libshared/Jamfile
index f42f7f7..44984b7 100644
--- a/src/build/libshared/Jamfile
+++ b/src/build/libshared/Jamfile
@@ -10,8 +10,4 @@ BuildPlatformStaticLibraryPIC libshared_build.a :
Keymap.cpp
NaturalCompare.cpp
SHA256.cpp
-
- # compression
- ZlibCompressionBase.cpp
- ZlibDecompressor.cpp
;
diff --git a/src/kits/package/Jamfile b/src/kits/package/Jamfile
index 8b96449..7706f84 100644
--- a/src/kits/package/Jamfile
+++ b/src/kits/package/Jamfile
@@ -13,9 +13,9 @@ HPKG_SOURCES =
BlockBufferPool.cpp
BlockBufferPoolImpl.cpp
BlockBufferPoolNoLock.cpp
- BufferDataOutput.cpp
BufferPool.cpp
CommitTransactionResult.cpp
+ DataOutput.cpp
DataReader.cpp
DataWriters.cpp
ErrorOutput.cpp
@@ -58,7 +58,9 @@ HPKG_SOURCES =
ReaderImplBaseV1.cpp
# compression
+ ZlibCompressionBase.cpp
ZlibCompressor.cpp
+ ZlibDecompressor.cpp
;
local architectureObject ;
diff --git a/src/kits/package/hpkg/BufferDataOutput.cpp
b/src/kits/package/hpkg/DataOutput.cpp
similarity index 78%
rename from src/kits/package/hpkg/BufferDataOutput.cpp
rename to src/kits/package/hpkg/DataOutput.cpp
index 8ae2543..00694b3 100644
--- a/src/kits/package/hpkg/BufferDataOutput.cpp
+++ b/src/kits/package/hpkg/DataOutput.cpp
@@ -4,7 +4,7 @@
*/
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <string.h>
@@ -14,6 +14,14 @@ namespace BPackageKit {
namespace BHPKG {
+// #pragma mark - BDataOutput
+
+
+BDataOutput::~BDataOutput()
+{
+}
+
+
// #pragma mark - BBufferDataOutput
@@ -27,7 +35,7 @@ BBufferDataOutput::BBufferDataOutput(void* buffer, size_t
size)
status_t
-BBufferDataOutput::Write(const void* buffer, size_t size)
+BBufferDataOutput::WriteData(const void* buffer, size_t size)
{
if (size == 0)
return B_OK;
diff --git a/src/kits/package/hpkg/DataReader.cpp
b/src/kits/package/hpkg/DataReader.cpp
index eb1a81c..b47f988 100644
--- a/src/kits/package/hpkg/DataReader.cpp
+++ b/src/kits/package/hpkg/DataReader.cpp
@@ -6,8 +6,7 @@
#include <package/hpkg/DataReader.h>
-#include <package/hpkg/BufferDataOutput.h>
-#include <DataIO.h>
+#include <package/hpkg/DataOutput.h>
#include <string.h>
@@ -71,7 +70,7 @@ BBufferDataReader::ReadData(off_t offset, void* buffer,
size_t size)
status_t
BBufferDataReader::ReadDataToOutput(off_t offset, size_t size,
- BDataIO* output)
+ BDataOutput* output)
{
if (size == 0)
return B_OK;
@@ -82,7 +81,7 @@ BBufferDataReader::ReadDataToOutput(off_t offset, size_t size,
if (size > fSize || offset > (off_t)fSize - (off_t)size)
return B_ERROR;
- return output->Write((const uint8*)fData + offset, size);
+ return output->WriteData((const uint8*)fData + offset, size);
}
diff --git a/src/kits/package/hpkg/DataWriters.cpp
b/src/kits/package/hpkg/DataWriters.cpp
index a22dcd0..29318c8 100644
--- a/src/kits/package/hpkg/DataWriters.cpp
+++ b/src/kits/package/hpkg/DataWriters.cpp
@@ -112,7 +112,7 @@ ZlibDataWriter::WriteDataNoThrow(const void* buffer,
status_t
-ZlibDataWriter::Write(const void* buffer, size_t size)
+ZlibDataWriter::WriteData(const void* buffer, size_t size)
{
return fDataWriter->WriteDataNoThrow(buffer, size);
}
diff --git a/src/kits/package/hpkg/PackageDataReader.cpp
b/src/kits/package/hpkg/PackageDataReader.cpp
index 3f0d326..9c808fe 100644
--- a/src/kits/package/hpkg/PackageDataReader.cpp
+++ b/src/kits/package/hpkg/PackageDataReader.cpp
@@ -13,7 +13,7 @@
#include <package/hpkg/HPKGDefsPrivate.h>
#include <package/hpkg/PackageData.h>
-#include <ZlibDecompressor.h>
+#include <package/hpkg/ZlibDecompressor.h>
namespace BPackageKit {
@@ -53,7 +53,7 @@ public:
}
virtual status_t ReadDataToOutput(off_t offset, size_t size,
- BDataIO* output)
+ BDataOutput* output)
{
if (size == 0)
return B_OK;
diff --git a/src/kits/package/hpkg/PackageFileHeapAccessorBase.cpp
b/src/kits/package/hpkg/PackageFileHeapAccessorBase.cpp
index 3ffa2a8..024b8f2 100644
--- a/src/kits/package/hpkg/PackageFileHeapAccessorBase.cpp
+++ b/src/kits/package/hpkg/PackageFileHeapAccessorBase.cpp
@@ -14,11 +14,11 @@
#include <new>
#include <ByteOrder.h>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/ErrorOutput.h>
#include <AutoDeleter.h>
-#include <ZlibDecompressor.h>
+#include <package/hpkg/ZlibDecompressor.h>
namespace BPackageKit {
@@ -140,7 +140,7 @@ PackageFileHeapAccessorBase::~PackageFileHeapAccessorBase()
status_t
PackageFileHeapAccessorBase::ReadDataToOutput(off_t offset, size_t size,
- BDataIO* output)
+ BDataOutput* output)
{
if (size == 0)
return B_OK;
@@ -174,8 +174,8 @@ PackageFileHeapAccessorBase::ReadDataToOutput(off_t offset,
size_t size,
// The last chunk may be shorter than kChunkSize, but
since
// size (and thus remainingSize) had been clamped, that
doesn't
// harm.
- error = output->Write((char*)uncompressedDataBuffer +
inChunkOffset,
- toWrite);
+ error = output->WriteData(
+ (char*)uncompressedDataBuffer + inChunkOffset, toWrite);
if (error != B_OK)
return error;
@@ -213,7 +213,7 @@ PackageFileHeapAccessorBase::DecompressChunkData(void*
compressedDataBuffer,
size_t uncompressedSize)
{
size_t actualSize;
- status_t error = ::BPrivate::ZlibDecompressor::DecompressSingleBuffer(
+ status_t error = ZlibDecompressor::DecompressSingleBuffer(
compressedDataBuffer, compressedSize, uncompressedDataBuffer,
uncompressedSize, actualSize);
if (error != B_OK) {
diff --git a/src/kits/package/hpkg/PackageReaderImpl.cpp
b/src/kits/package/hpkg/PackageReaderImpl.cpp
index b821d4c..6842598 100644
--- a/src/kits/package/hpkg/PackageReaderImpl.cpp
+++ b/src/kits/package/hpkg/PackageReaderImpl.cpp
@@ -22,11 +22,11 @@
#include <package/hpkg/HPKGDefsPrivate.h>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/PackageData.h>
#include <package/hpkg/PackageEntry.h>
#include <package/hpkg/PackageEntryAttribute.h>
-#include <ZlibDecompressor.h>
+#include <package/hpkg/ZlibDecompressor.h>
namespace BPackageKit {
diff --git a/src/kits/package/hpkg/PackageWriterImpl.cpp
b/src/kits/package/hpkg/PackageWriterImpl.cpp
index a9348db..c57eeba 100644
--- a/src/kits/package/hpkg/PackageWriterImpl.cpp
+++ b/src/kits/package/hpkg/PackageWriterImpl.cpp
@@ -37,7 +37,7 @@
#include <package/hpkg/HPKGDefsPrivate.h>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/DataReader.h>
#include <package/hpkg/PackageFileHeapWriter.h>
#include <package/hpkg/PackageReaderImpl.h>
diff --git a/src/kits/package/hpkg/ReaderImplBase.cpp
b/src/kits/package/hpkg/ReaderImplBase.cpp
index e5c1564..af771ec 100644
--- a/src/kits/package/hpkg/ReaderImplBase.cpp
+++ b/src/kits/package/hpkg/ReaderImplBase.cpp
@@ -19,9 +19,9 @@
#include <package/hpkg/HPKGDefsPrivate.h>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/PackageFileHeapReader.h>
-#include <ZlibDecompressor.h>
+#include <package/hpkg/ZlibDecompressor.h>
namespace BPackageKit {
diff --git a/src/kits/shared/ZlibCompressionBase.cpp
b/src/kits/package/hpkg/ZlibCompressionBase.cpp
similarity index 84%
rename from src/kits/shared/ZlibCompressionBase.cpp
rename to src/kits/package/hpkg/ZlibCompressionBase.cpp
index 2377353..4fe4337 100644
--- a/src/kits/shared/ZlibCompressionBase.cpp
+++ b/src/kits/package/hpkg/ZlibCompressionBase.cpp
@@ -4,13 +4,17 @@
*/
-#include <ZlibCompressionBase.h>
+#include <package/hpkg/ZlibCompressionBase.h>
#include <errno.h>
#include <zlib.h>
+namespace BPackageKit {
+
+namespace BHPKG {
+
namespace BPrivate {
@@ -44,3 +48,7 @@ ZlibCompressionBase::TranslateZlibError(int error)
} // namespace BPrivate
+
+} // namespace BHPKG
+
+} // namespace BPackageKit
diff --git a/src/kits/package/hpkg/ZlibCompressor.cpp
b/src/kits/package/hpkg/ZlibCompressor.cpp
index b9e6e6f..a2a5dea 100644
--- a/src/kits/package/hpkg/ZlibCompressor.cpp
+++ b/src/kits/package/hpkg/ZlibCompressor.cpp
@@ -9,7 +9,7 @@
#include <errno.h>
#include <stdio.h>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
namespace BPackageKit {
@@ -22,7 +22,7 @@ namespace BPrivate {
static const size_t kOutputBufferSize = 1024;
-ZlibCompressor::ZlibCompressor(BDataIO* output)
+ZlibCompressor::ZlibCompressor(BDataOutput* output)
:
fOutput(output),
fStreamInitialized(false)
@@ -82,7 +82,7 @@ ZlibCompressor::CompressNext(const void* input, size_t
inputSize)
return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) {
- status_t error = fOutput->Write(outputBuffer,
+ status_t error = fOutput->WriteData(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
if (error != B_OK)
return error;
@@ -109,7 +109,7 @@ ZlibCompressor::Finish()
return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) {
- status_t error = fOutput->Write(outputBuffer,
+ status_t error = fOutput->WriteData(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
if (error != B_OK)
return error;
diff --git a/src/kits/shared/ZlibDecompressor.cpp
b/src/kits/package/hpkg/ZlibDecompressor.cpp
similarity index 91%
rename from src/kits/shared/ZlibDecompressor.cpp
rename to src/kits/package/hpkg/ZlibDecompressor.cpp
index 17552a8..2ab2d4c 100644
--- a/src/kits/shared/ZlibDecompressor.cpp
+++ b/src/kits/package/hpkg/ZlibDecompressor.cpp
@@ -4,14 +4,18 @@
*/
-#include <ZlibDecompressor.h>
+#include <package/hpkg/ZlibDecompressor.h>
#include <errno.h>
#include <stdio.h>
-#include <DataIO.h>
+#include <package/hpkg/DataOutput.h>
+namespace BPackageKit {
+
+namespace BHPKG {
+
namespace BPrivate {
@@ -19,7 +23,7 @@ namespace BPrivate {
static const size_t kOutputBufferSize = 1024;
-ZlibDecompressor::ZlibDecompressor(BDataIO* output)
+ZlibDecompressor::ZlibDecompressor(BDataOutput* output)
:
fOutput(output),
fStreamInitialized(false),
@@ -85,7 +89,7 @@ ZlibDecompressor::DecompressNext(const void* input, size_t
inputSize)
return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) {
- status_t error = fOutput->Write(outputBuffer,
+ status_t error = fOutput->WriteData(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
if (error != B_OK)
return error;
@@ -114,7 +118,7 @@ ZlibDecompressor::Finish()
return TranslateZlibError(zlibError);
if (fStream.avail_out < sizeof(outputBuffer)) {
- status_t error = fOutput->Write(outputBuffer,
+ status_t error = fOutput->WriteData(outputBuffer,
sizeof(outputBuffer) - fStream.avail_out);
if (error != B_OK)
return error;
@@ -182,3 +186,7 @@ ZlibDecompressor::DecompressSingleBuffer(const void* input,
size_t inputSize,
} // namespace BPrivate
+
+} // namespace BHPKG
+
+} // namespace BPackageKit
diff --git a/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
b/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
index e8d47ed..4c60352 100644
--- a/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
+++ b/src/kits/package/hpkg/v1/PackageDataReaderV1.cpp
@@ -11,12 +11,12 @@
#include <algorithm>
#include <new>
-#include <package/hpkg/BufferDataOutput.h>
#include <package/hpkg/BufferPool.h>
#include <package/hpkg/PoolBuffer.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/v1/HPKGDefsPrivate.h>
#include <package/hpkg/v1/PackageData.h>
-#include <ZlibDecompressor.h>
+#include <package/hpkg/ZlibDecompressor.h>
namespace BPackageKit {
@@ -27,7 +27,7 @@ namespace V1 {
using BHPKG::BPrivate::PoolBufferPutter;
-using ::BPrivate::ZlibDecompressor;
+using BHPKG::BPrivate::ZlibDecompressor;
// minimum/maximum zlib chunk size we consider sane
@@ -98,7 +98,7 @@ public:
}
virtual status_t ReadDataToOutput(off_t offset, size_t size,
- BDataIO* output)
+ BDataOutput* output)
{
if (size == 0)
return B_OK;
@@ -125,7 +125,7 @@ public:
return error;
// write to the output
- error = output->Write(buffer->Buffer(), toRead);
+ error = output->WriteData(buffer->Buffer(), toRead);
if (error != B_OK)
return error;
@@ -205,7 +205,7 @@ public:
}
virtual status_t ReadDataToOutput(off_t offset, size_t size,
- BDataIO* output)
+ BDataOutput* output)
{
// check offset and size
if (size == 0)
@@ -244,7 +244,7 @@ public:
// write data to output
size_t toCopy = std::min(size, (size_t)fChunkSize -
inChunkOffset);
- error = output->Write(
+ error = output->WriteData(
(uint8*)fUncompressBuffer->Buffer() +
inChunkOffset, toCopy);
if (error != B_OK)
return error;
diff --git a/src/kits/package/hpkg/v1/PackageReaderImplV1.cpp
b/src/kits/package/hpkg/v1/PackageReaderImplV1.cpp
index 8541f84..5fa75d5 100644
--- a/src/kits/package/hpkg/v1/PackageReaderImplV1.cpp
+++ b/src/kits/package/hpkg/v1/PackageReaderImplV1.cpp
@@ -22,12 +22,12 @@
#include <package/hpkg/v1/HPKGDefsPrivate.h>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/ErrorOutput.h>
#include <package/hpkg/v1/PackageData.h>
#include <package/hpkg/v1/PackageEntry.h>
#include <package/hpkg/v1/PackageEntryAttribute.h>
-#include <ZlibDecompressor.h>
+#include <package/hpkg/ZlibDecompressor.h>
namespace BPackageKit {
diff --git a/src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp
b/src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp
index 9768c33..74bf776 100644
--- a/src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp
+++ b/src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp
@@ -19,9 +19,9 @@
#include <package/hpkg/v1/HPKGDefsPrivate.h>
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
#include <package/hpkg/ErrorOutput.h>
-#include <ZlibDecompressor.h>
+#include <package/hpkg/ZlibDecompressor.h>
namespace BPackageKit {
@@ -33,7 +33,7 @@ namespace V1 {
namespace BPrivate {
-using ::BPrivate::ZlibDecompressor;
+using BHPKG::BPrivate::ZlibDecompressor;
static const size_t kScratchBufferSize = 64 * 1024;
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index 6b78dc3..212d499 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -11,8 +11,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
local architecture = $(TARGET_PACKAGING_ARCH) ;
- UseBuildFeatureHeaders zlib ;
-
UseHeaders [ FDirName
$(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCHS[1]))
servers input ] ;
@@ -23,9 +21,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
# for RWLockManager only
UsePrivateSystemHeaders ;
UsePrivateHeaders kernel libroot ;
-
- Includes [ FGristFiles $(HPKG_SOURCES) ]
- : [ BuildFeatureAttribute zlib : headers ] ;
StaticLibrary [ MultiArchDefaultGristFiles libshared.a ] :
AboutMenuItem.cpp
@@ -52,10 +47,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
TextTable.cpp
Thread.cpp
Variant.cpp
-
- # compression
- ZlibCompressionBase.cpp
- ZlibDecompressor.cpp
;
Includes [ FGristFiles Keymap.cpp ]
diff --git a/src/system/boot/loader/file_systems/packagefs/Jamfile
b/src/system/boot/loader/file_systems/packagefs/Jamfile
index 7fadf51..2425fdf 100644
--- a/src/system/boot/loader/file_systems/packagefs/Jamfile
+++ b/src/system/boot/loader/file_systems/packagefs/Jamfile
@@ -13,8 +13,6 @@ SubDirC++Flags -fno-rtti -include $(kernelC++Header) ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
-SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits shared ] ;
-SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits support ] ;
BootStaticLibrary boot_packagefs :
@@ -27,9 +25,9 @@ BootStaticLibrary boot_packagefs :
BlockBufferPool.cpp
BlockBufferPoolImpl.cpp
BlockBufferPoolNoLock.cpp
- BufferDataOutput.cpp
BufferPool.cpp
PoolBuffer.cpp
+ DataOutput.cpp
DataReader.cpp
ErrorOutput.cpp
FDDataReader.cpp
@@ -44,7 +42,6 @@ BootStaticLibrary boot_packagefs :
ReaderImplBase.cpp
# compression
- DataIO.cpp
ZlibCompressionBase.cpp
ZlibDecompressor.cpp
Other related posts:
- » [haiku-commits] haiku: hrev47401 - src/kits/package/hpkg src/kits/shared src/kits/network/libnetapi headers/private/package/hpkg src/add-ons/kernel/file_systems/packagefs/package - ingo_weinhold
