i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ZlibDecompressor to libshared

Browse Source 
* This will be used to implement compressed http streams
* Remove the custom BDataOutput class, and use BDataIO instead, for
easier integration with existing code.
This commit is contained in:
Adrien Destugues
2014-02-11 12:06:38 +01:00
parent 9f11100be5
commit 9af2105d36
37 changed files with 131 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/build/os/package/hpkg/DataOutput.h → headers/build/os/package/hpkg/BufferDataOutput.h
View File
headers/build/private/package/hpkg/ZlibCompressionBase.h
-1
View File
@@ -1 +0,0 @@
#include <../private/package/hpkg/ZlibCompressionBase.h>
headers/build/private/package/hpkg/ZlibDecompressor.h
-1
View File
@@ -1 +0,0 @@
#include <../private/package/hpkg/ZlibDecompressor.h>
headers/build/private/shared/ZlibCompressionBase.h
+1
View File
@@ -0,0 +1 @@
#include <../private/shared/ZlibCompressionBase.h>
headers/build/private/shared/ZlibDecompressor.h
+1
View File
@@ -0,0 +1 @@
#include <../private/shared/ZlibDecompressor.h>
headers/os/package/hpkg/DataOutput.h → headers/os/package/hpkg/BufferDataOutput.h
+5 -10
View File
@@ -6,6 +6,7 @@
#define _PACKAGE__HPKG__DATA_OUTPUT_H_
#include <DataIO.h>
#include <SupportDefs.h>
@@ -14,21 +15,15 @@ namespace BPackageKit {
namespace BHPKG {
class BDataOutput {
public:
virtual ~BDataOutput();
virtual status_t WriteData(const void* buffer, size_t size) = 0;
};
class BBufferDataOutput : public BDataOutput {
class BBufferDataOutput : public BDataIO {
public:
BBufferDataOutput(void* buffer, size_t size);
size_t BytesWritten() const { return fBytesWritten; }
virtual status_t WriteData(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; }
private:
void* fBuffer;
headers/os/package/hpkg/DataReader.h
+5 -5
View File
@@ -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,
BDataOutput* output) = 0;
BDataIO* 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,
BDataOutput* output);
BDataIO* output);
private:
const void* fData;
headers/private/package/hpkg/DataWriters.h
+3 -3
View File
@@ -7,7 +7,7 @@
#define _PACKAGE__HPKG__PRIVATE__DATA_WRITERS_H_
#include <package/hpkg/DataOutput.h>
#include <package/hpkg/BufferDataOutput.h>
#include <package/hpkg/ZlibCompressor.h>
@@ -59,7 +59,7 @@ private:
};
class ZlibDataWriter : public AbstractDataWriter, private BDataOutput {
class ZlibDataWriter : public AbstractDataWriter, private BDataIO {
public:
ZlibDataWriter(AbstractDataWriter* dataWriter);
@@ -71,7 +71,7 @@ public:
private:
// BDataOutput
virtual status_t WriteData(const void* buffer, size_t size);
virtual status_t Write(const void* buffer, size_t size);
private:
AbstractDataWriter* fDataWriter;
headers/private/package/hpkg/PackageFileHeapAccessorBase.h
+1 -1
View File
@@ -49,7 +49,7 @@ public:
// BAbstractBufferedDataReader
virtual status_t ReadDataToOutput(off_t offset, size_t size,
BDataOutput* output);
BDataIO* output);
public:
static const size_t kChunkSize = 64 * 1024;
headers/private/package/hpkg/WriterImplBase.h
+1 -1
View File
@@ -10,7 +10,7 @@
#include <package/hpkg/HPKGDefsPrivate.h>
#include <package/hpkg/DataOutput.h>
#include <package/hpkg/BufferDataOutput.h>
#include <package/hpkg/DataWriters.h>
#include <package/hpkg/PackageWriter.h>
#include <package/hpkg/Strings.h>
headers/private/package/hpkg/ZlibCompressor.h
+7 -7
View File
@@ -8,7 +8,10 @@
#include <zlib.h>
#include <package/hpkg/ZlibCompressionBase.h>
#include <ZlibCompressionBase.h>
class BDataIO;
namespace BPackageKit {
@@ -16,15 +19,12 @@ namespace BPackageKit {
namespace BHPKG {
class BDataOutput;
namespace BPrivate {
class ZlibCompressor : public ZlibCompressionBase {
class ZlibCompressor : public ::BPrivate::ZlibCompressionBase {
public:
ZlibCompressor(BDataOutput* output);
ZlibCompressor(BDataIO* output);
~ZlibCompressor();
status_t Init(int compressionLevel = Z_BEST_COMPRESSION);
@@ -39,7 +39,7 @@ public:
private:
z_stream fStream;
BDataOutput* fOutput;
BDataIO* fOutput;
bool fStreamInitialized;
};
headers/private/package/hpkg/ZlibCompressionBase.h → headers/private/shared/ZlibCompressionBase.h
+3 -12
View File
@@ -2,17 +2,13 @@
* Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
* Distributed under the terms of the MIT License.
*/
#ifndef _PACKAGE__HPKG__PRIVATE__ZLIB_COMPRESSION_BASE_H_
#define _PACKAGE__HPKG__PRIVATE__ZLIB_COMPRESSION_BASE_H_
#ifndef _PRIVATE__ZLIB_COMPRESSION_BASE_H_
#define _PRIVATE__ZLIB_COMPRESSION_BASE_H_
#include <SupportDefs.h>
namespace BPackageKit {
namespace BHPKG {
namespace BPrivate {
@@ -24,9 +20,4 @@ public:
} // namespace BPrivate
} // namespace BHPKG
} // namespace BPackageKit
#endif // _PACKAGE__HPKG__PRIVATE__ZLIB_COMPRESSION_BASE_H_
#endif // _PRIVATE__ZLIB_COMPRESSION_BASE_H_
headers/private/package/hpkg/ZlibDecompressor.h → headers/private/shared/ZlibDecompressor.h
+6 -16
View File
@@ -2,21 +2,16 @@
* Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
* Distributed under the terms of the MIT License.
*/
#ifndef _PACKAGE__HPKG__PRIVATE__ZLIB_DECOMPRESSOR_H_
#define _PACKAGE__HPKG__PRIVATE__ZLIB_DECOMPRESSOR_H_
#ifndef _PRIVATE__ZLIB_DECOMPRESSOR_H_
#define _PRIVATE__ZLIB_DECOMPRESSOR_H_
#include <zlib.h>
#include <package/hpkg/ZlibCompressionBase.h>
#include <ZlibCompressionBase.h>
namespace BPackageKit {
namespace BHPKG {
class BDataOutput;
class BDataIO;
namespace BPrivate {
@@ -24,7 +19,7 @@ namespace BPrivate {
class ZlibDecompressor : public ZlibCompressionBase {
public:
ZlibDecompressor(BDataOutput* output);
ZlibDecompressor(BDataIO* output);
~ZlibDecompressor();
status_t Init();
@@ -39,7 +34,7 @@ public:
private:
z_stream fStream;
BDataOutput* fOutput;
BDataIO* fOutput;
bool fStreamInitialized;
bool fFinished;
};
@@ -47,9 +42,4 @@ private:
} // namespace BPrivate
} // namespace BHPKG
} // namespace BPackageKit
#endif // _PACKAGE__HPKG__PRIVATE__ZLIB_DECOMPRESSOR_H_