refactor: don't expose libxml2 headers, forward declare types instead

darlinghq · Jun 22, 2023 · 85c6cd3 · 85c6cd3
1 parent f220fce
commit 85c6cd3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/DMGDisk.cpp b/src/DMGDisk.cpp
@@ -14,6 +14,9 @@
 #include "SubReader.h"
 #include "exceptions.h"
 
+#include <libxml/parser.h>
+#include <libxml/xpath.h>
+
 DMGDisk::DMGDisk(std::shared_ptr<Reader> reader)
 	: m_reader(reader), m_zone(40000)
 {

diff --git a/src/DMGDisk.h b/src/DMGDisk.h
@@ -1,11 +1,19 @@
 #ifndef DMGDISK_H
 #define DMGDISK_H
+
 #include "PartitionedDisk.h"
 #include "Reader.h"
 #include "dmg.h"
 #include "CacheZone.h"
-#include <libxml/parser.h>
-#include <libxml/xpath.h>
+
+struct _xmlDoc;
+typedef struct _xmlDoc xmlDoc;
+
+struct _xmlXPathContext;
+typedef struct _xmlXPathContext xmlXPathContext;
+
+struct _xmlNodeSet;
+typedef struct _xmlNodeSet xmlNodeSet;
 
 class DMGDisk : public PartitionedDisk
 {
@@ -19,7 +27,7 @@ class DMGDisk : public PartitionedDisk
 	static bool isDMG(std::shared_ptr<Reader> reader);
 private:
 	void loadKoly(const UDIFResourceFile& koly);
-	bool loadPartitionElements(xmlXPathContextPtr xpathContext, xmlNodeSetPtr nodes);
+	bool loadPartitionElements(xmlXPathContext* xpathContext, xmlNodeSet* nodes);
 	static bool parseNameAndType(const std::string& nameAndType, std::string& name, std::string& type);
 	static bool base64Decode(const std::string& input, std::vector<uint8_t>& output);
 	BLKXTable* loadBLKXTableForPartition(int index);
@@ -28,7 +36,7 @@ class DMGDisk : public PartitionedDisk
 	std::shared_ptr<Reader> m_reader;
 	std::vector<Partition> m_partitions;
 	UDIFResourceFile m_udif;
-	xmlDocPtr m_kolyXML;
+	xmlDoc* m_kolyXML;
 	CacheZone m_zone;
 };