First changes of librarization of the ancient: namespacing and api-he…

…aders
temisu · May 7, 2021 · 85de2c8 · 85de2c8
1 parent db332a6
commit 85de2c8
Show file tree

Hide file tree

Showing 147 changed files with 855 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 VPATH  := src src/Lzh src/Zip src/common fuzzing
 
 CXX	?= c++
-COMMONFLAGS = -Os -Wall -Wsign-compare -Wnarrowing -Wno-error=multichar -Wno-multichar -Isrc
+COMMONFLAGS = -Os -Wall -Wsign-compare -Wnarrowing -Wno-error=multichar -Wno-multichar -Isrc -Iapi
 CFLAGS	= $(COMMONFLAGS)
 CXXFLAGS = $(COMMONFLAGS) -std=c++17 -fno-rtti
 

diff --git a/src/common/Buffer.hpp → api/Buffer.hpp b/src/common/Buffer.hpp → api/Buffer.hpp
@@ -8,6 +8,9 @@
 
 #include <exception>
 
+namespace ancient
+{
+
 class Buffer
 {
 protected:
@@ -71,4 +74,6 @@ class Buffer
 	uint8_t read8(size_t offset) const;
 };
 
+}
+
 #endif
diff --git a/src/Decompressor.hpp → api/Decompressor.hpp b/src/Decompressor.hpp → api/Decompressor.hpp
@@ -8,9 +8,12 @@
 
 #include <string>
 #include <memory>
+#include <vector>
 
-#include "common/Common.hpp"
-#include "common/Buffer.hpp"
+#include "Buffer.hpp"
+
+namespace ancient
+{
 
 class Decompressor
 {
@@ -88,7 +91,7 @@ class Decompressor
 	// This does not guarantee the data is decompressable though, only signature is read
 	static bool detect(const Buffer &packedData) noexcept;
 
-	// Registering new decompressors, not really part of public API
+protected:
 	template<class T>
 	class Registry
 	{
@@ -104,7 +107,6 @@ class Decompressor
 		}
 	};
 
-protected:
 	virtual void decompressImpl(Buffer &rawData,bool verify)=0;
 
 private:
@@ -113,5 +115,6 @@ class Decompressor
 	static std::vector<std::pair<bool(*)(uint32_t),std::unique_ptr<Decompressor>(*)(const Buffer&,bool,bool)>> *_decompressors;
 };
 
+}
 
 #endif
diff --git a/main.cpp b/main.cpp
@@ -17,6 +17,8 @@
 #include "common/StaticBuffer.hpp"
 #include "Decompressor.hpp"
 
+using namespace ancient;
+
 std::unique_ptr<Buffer> readFile(const std::string &fileName)
 {
 

diff --git a/src/ACCADecompressor.cpp b/src/ACCADecompressor.cpp
@@ -3,6 +3,11 @@
 #include "ACCADecompressor.hpp"
 #include "InputStream.hpp"
 #include "OutputStream.hpp"
+#include "common/Common.hpp"
+
+
+namespace ancient
+{
 
 bool ACCADecompressor::detectHeaderXPK(uint32_t hdr) noexcept
 {
@@ -105,3 +110,5 @@ void ACCADecompressor::decompressImpl(Buffer &rawData,const Buffer &previousData
 }
 
 XPKDecompressor::Registry<ACCADecompressor> ACCADecompressor::_XPKregistration;
+
+}
diff --git a/src/ACCADecompressor.hpp b/src/ACCADecompressor.hpp
@@ -5,6 +5,9 @@
 
 #include "XPKDecompressor.hpp"
 
+namespace ancient
+{
+
 class ACCADecompressor : public XPKDecompressor
 {
 public:
@@ -25,4 +28,6 @@ class ACCADecompressor : public XPKDecompressor
 	static XPKDecompressor::Registry<ACCADecompressor> _XPKregistration;
 };
 
+}
+
 #endif
diff --git a/src/ARTMDecompressor.cpp b/src/ARTMDecompressor.cpp
@@ -4,6 +4,11 @@
 #include "RangeDecoder.hpp"
 #include "InputStream.hpp"
 #include "OutputStream.hpp"
+#include "common/Common.hpp"
+
+
+namespace ancient
+{
 
 bool ARTMDecompressor::detectHeaderXPK(uint32_t hdr) noexcept
 {
@@ -115,3 +120,5 @@ void ARTMDecompressor::decompressImpl(Buffer &rawData,const Buffer &previousData
 }
 
 XPKDecompressor::Registry<ARTMDecompressor> ARTMDecompressor::_XPKregistration;
+
+}
diff --git a/src/ARTMDecompressor.hpp b/src/ARTMDecompressor.hpp
@@ -5,6 +5,9 @@
 
 #include "XPKDecompressor.hpp"
 
+namespace ancient
+{
+
 class ARTMDecompressor : public XPKDecompressor
 {
 public:
@@ -25,4 +28,6 @@ class ARTMDecompressor : public XPKDecompressor
 	static XPKDecompressor::Registry<ARTMDecompressor> _XPKregistration;
 };
 
+}
+
 #endif
diff --git a/src/BLZWDecompressor.cpp b/src/BLZWDecompressor.cpp
@@ -3,6 +3,11 @@
 #include "BLZWDecompressor.hpp"
 #include "InputStream.hpp"
 #include "OutputStream.hpp"
+#include "common/Common.hpp"
+
+
+namespace ancient
+{
 
 bool BLZWDecompressor::detectHeaderXPK(uint32_t hdr)
 {
@@ -120,3 +125,5 @@ void BLZWDecompressor::decompressImpl(Buffer &rawData,const Buffer &previousData
 }
 
 XPKDecompressor::Registry<BLZWDecompressor> BLZWDecompressor::_XPKregistration;
+
+}
diff --git a/src/BLZWDecompressor.hpp b/src/BLZWDecompressor.hpp
@@ -5,6 +5,9 @@
 
 #include "XPKDecompressor.hpp"
 
+namespace ancient
+{
+
 class BLZWDecompressor : public XPKDecompressor
 {
 public:
@@ -28,4 +31,6 @@ class BLZWDecompressor : public XPKDecompressor
 	static XPKDecompressor::Registry<BLZWDecompressor> _XPKregistration;
 };
 
+}
+
 #endif
diff --git a/src/BZIP2Decompressor.cpp b/src/BZIP2Decompressor.cpp
@@ -9,6 +9,11 @@
 #include "OutputStream.hpp"
 #include "common/MemoryBuffer.hpp"
 #include "common/CRC32.hpp"
+#include "common/Common.hpp"
+
+
+namespace ancient
+{
 
 bool BZIP2Decompressor::detectHeader(uint32_t hdr) noexcept
 {
@@ -393,3 +398,5 @@ void BZIP2Decompressor::decompressImpl(Buffer &rawData,const Buffer &previousDat
 
 Decompressor::Registry<BZIP2Decompressor> BZIP2Decompressor::_registration;
 XPKDecompressor::Registry<BZIP2Decompressor> BZIP2Decompressor::_XPKregistration;
+
+}
diff --git a/src/BZIP2Decompressor.hpp b/src/BZIP2Decompressor.hpp
@@ -6,6 +6,9 @@
 #include "Decompressor.hpp"
 #include "XPKDecompressor.hpp"
 
+namespace ancient
+{
+
 class BZIP2Decompressor : public Decompressor, public XPKDecompressor
 {
 public:
@@ -39,4 +42,6 @@ class BZIP2Decompressor : public Decompressor, public XPKDecompressor
 	static XPKDecompressor::Registry<BZIP2Decompressor> _XPKregistration;
 };
 
+}
+
 #endif
diff --git a/src/CBR0Decompressor.cpp b/src/CBR0Decompressor.cpp
@@ -3,6 +3,11 @@
 #include "CBR0Decompressor.hpp"
 #include "InputStream.hpp"
 #include "OutputStream.hpp"
+#include "common/Common.hpp"
+
+
+namespace ancient
+{
 
 bool CBR0Decompressor::detectHeaderXPK(uint32_t hdr) noexcept
 {
@@ -57,3 +62,5 @@ void CBR0Decompressor::decompressImpl(Buffer &rawData,const Buffer &previousData
 }
 
 XPKDecompressor::Registry<CBR0Decompressor> CBR0Decompressor::_XPKregistration;
+
+}
diff --git a/src/CBR0Decompressor.hpp b/src/CBR0Decompressor.hpp
@@ -5,6 +5,9 @@
 
 #include "XPKDecompressor.hpp"
 
+namespace ancient
+{
+
 class CBR0Decompressor : public XPKDecompressor
 {
 public:
@@ -26,4 +29,6 @@ class CBR0Decompressor : public XPKDecompressor
 	static XPKDecompressor::Registry<CBR0Decompressor> _XPKregistration;
 };
 
+}
+
 #endif
diff --git a/src/CRMDecompressor.cpp b/src/CRMDecompressor.cpp
@@ -6,6 +6,11 @@
 #include "InputStream.hpp"
 #include "OutputStream.hpp"
 #include "common/OverflowCheck.hpp"
+#include "common/Common.hpp"
+
+
+namespace ancient
+{
 
 bool CRMDecompressor::detectHeader(uint32_t hdr) noexcept
 {
@@ -239,3 +244,5 @@ void CRMDecompressor::decompressImpl(Buffer &rawData,const Buffer &previousData,
 
 Decompressor::Registry<CRMDecompressor> CRMDecompressor::_registration;
 XPKDecompressor::Registry<CRMDecompressor> CRMDecompressor::_XPKregistration;
+
+}
diff --git a/src/CRMDecompressor.hpp b/src/CRMDecompressor.hpp
@@ -6,6 +6,9 @@
 #include "Decompressor.hpp"
 #include "XPKDecompressor.hpp"
 
+namespace ancient
+{
+
 class CRMDecompressor : public Decompressor, public XPKDecompressor
 {
 public:
@@ -41,4 +44,6 @@ class CRMDecompressor : public Decompressor, public XPKDecompressor
 	static XPKDecompressor::Registry<CRMDecompressor> _XPKregistration;
 };
 
+}
+
 #endif
diff --git a/src/CYB2Decoder.cpp b/src/CYB2Decoder.cpp
@@ -5,6 +5,11 @@
 #include "common/SubBuffer.hpp"
 #include "CYB2Decoder.hpp"
 #include "XPKMain.hpp"
+#include "common/Common.hpp"
+
+
+namespace ancient
+{
 
 bool CYB2Decoder::detectHeaderXPK(uint32_t hdr) noexcept
 {
@@ -55,3 +60,5 @@ void CYB2Decoder::decompressImpl(Buffer &rawData,const Buffer &previousData,bool
 }
 
 XPKDecompressor::Registry<CYB2Decoder> CYB2Decoder::_XPKregistration;
+
+}
diff --git a/src/CYB2Decoder.hpp b/src/CYB2Decoder.hpp
@@ -5,6 +5,9 @@
 
 #include "XPKDecompressor.hpp"
 
+namespace ancient
+{
+
 class CYB2Decoder : public XPKDecompressor
 {
 public:
@@ -27,4 +30,6 @@ class CYB2Decoder : public XPKDecompressor
 	static XPKDecompressor::Registry<CYB2Decoder> _XPKregistration;
 };
 
+}
+
 #endif
diff --git a/src/DEFLATEDecompressor.cpp b/src/DEFLATEDecompressor.cpp
@@ -9,6 +9,11 @@
 #include "OutputStream.hpp"
 #include "common/CRC32.hpp"
 #include "common/OverflowCheck.hpp"
+#include "common/Common.hpp"
+
+
+namespace ancient
+{
 
 static uint32_t Adler32(const Buffer &buffer,size_t offset,size_t len)
 {
@@ -380,3 +385,5 @@ void DEFLATEDecompressor::decompressImpl(Buffer &rawData,const Buffer &previousD
 
 Decompressor::Registry<DEFLATEDecompressor> DEFLATEDecompressor::_registration;
 XPKDecompressor::Registry<DEFLATEDecompressor> DEFLATEDecompressor::_XPKregistration;
+
+}
diff --git a/src/DEFLATEDecompressor.hpp b/src/DEFLATEDecompressor.hpp
@@ -6,6 +6,9 @@
 #include "Decompressor.hpp"
 #include "XPKDecompressor.hpp"
 
+namespace ancient
+{
+
 class DEFLATEDecompressor : public Decompressor, public XPKDecompressor
 {
 public:
@@ -52,4 +55,6 @@ class DEFLATEDecompressor : public Decompressor, public XPKDecompressor
 	static XPKDecompressor::Registry<DEFLATEDecompressor> _XPKregistration;
 };
 
+}
+
 #endif
diff --git a/src/DLTADecode.cpp b/src/DLTADecode.cpp
@@ -3,8 +3,12 @@
 #include "DLTADecode.hpp"
 
 #include "common/OverflowCheck.hpp"
+#include "common/Common.hpp"
 
 
+namespace ancient
+{
+
 bool DLTADecode::detectHeaderXPK(uint32_t hdr) noexcept
 {
 	return hdr==FourCC("DLTA");
@@ -56,3 +60,5 @@ void DLTADecode::decompressImpl(Buffer &rawData,const Buffer &previousData,bool
 }
 
 XPKDecompressor::Registry<DLTADecode> DLTADecode::_XPKregistration;
+
+}
diff --git a/src/DLTADecode.hpp b/src/DLTADecode.hpp
@@ -5,6 +5,10 @@
 
 #include "XPKDecompressor.hpp"
 
+namespace ancient
+{
+
+
 class DLTADecode : public XPKDecompressor
 {
 public:
@@ -28,4 +32,6 @@ class DLTADecode : public XPKDecompressor
 	static XPKDecompressor::Registry<DLTADecode> _XPKregistration;
 };
 
+}
+
 #endif