Revert "Move ZlibDecompressor to libshared"

This reverts commit 9af2105d36.

Conflicts:
	src/kits/package/Jamfile

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;

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;