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

package kit: internalize BPackageDataReader

Browse Source 
It is no longer public (or even private) API. BPackageDataReaderFactory
returns a BAbstractBufferedDataReader instead. The advantage is that
the latter doesn't have hpkg format specific dependencies.
This commit is contained in:
Ingo Weinhold
2013-05-25 01:12:23 +02:00
parent 175ff8ec77
commit 2c32402da5
11 changed files with 64 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/package/hpkg/PackageDataReader.h
+1 -19
View File
@@ -15,27 +15,9 @@ namespace BHPKG {
class BBufferCache;
class BDataOutput;
class BPackageData;
class BPackageDataReader : public BDataReader {
public:
BPackageDataReader(BDataReader* dataReader);
virtual ~BPackageDataReader();
virtual status_t Init(const BPackageData& data) = 0;
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;
protected:
BDataReader* fDataReader;
};
class BPackageDataReaderFactory {
public:
BPackageDataReaderFactory(
@@ -43,7 +25,7 @@ public:
status_t CreatePackageDataReader(BDataReader* dataReader,
const BPackageData& data,
BPackageDataReader*& _reader);
BAbstractBufferedDataReader*& _reader);
private:
BBufferCache* fBufferCache;
headers/os/package/hpkg/v1/PackageDataReader.h
+1 -19
View File
@@ -15,7 +15,6 @@ namespace BHPKG {
class BBufferCache;
class BDataOutput;
namespace V1 {
@@ -24,23 +23,6 @@ namespace V1 {
class BPackageData;
class BPackageDataReader : public BDataReader {
public:
BPackageDataReader(BDataReader* dataReader);
virtual ~BPackageDataReader();
virtual status_t Init(const BPackageData& data) = 0;
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;
protected:
BDataReader* fDataReader;
};
class BPackageDataReaderFactory {
public:
BPackageDataReaderFactory(
@@ -48,7 +30,7 @@ public:
status_t CreatePackageDataReader(BDataReader* dataReader,
const BPackageData& data,
BPackageDataReader*& _reader);
BAbstractBufferedDataReader*& _reader);
private:
BBufferCache* fBufferCache;