diff --git a/vmicore/src/include/vmicore/os/IMemoryRegionExtractor.h b/vmicore/src/include/vmicore/os/IMemoryRegionExtractor.h index 84cafe04..47842e3d 100644 --- a/vmicore/src/include/vmicore/os/IMemoryRegionExtractor.h +++ b/vmicore/src/include/vmicore/os/IMemoryRegionExtractor.h @@ -2,8 +2,8 @@ #define VMICORE_IMEMORYREGIONEXTRACTOR_H #include "MemoryRegion.h" -#include #include +#include namespace VmiCore { @@ -12,7 +12,7 @@ namespace VmiCore public: virtual ~IMemoryRegionExtractor() = default; - [[nodiscard]] virtual std::unique_ptr> extractAllMemoryRegions() const = 0; + [[nodiscard]] virtual std::unique_ptr> extractAllMemoryRegions() const = 0; protected: IMemoryRegionExtractor() = default; diff --git a/vmicore/src/lib/os/linux/MMExtractor.cpp b/vmicore/src/lib/os/linux/MMExtractor.cpp index fdbdccee..1972f11b 100644 --- a/vmicore/src/lib/os/linux/MMExtractor.cpp +++ b/vmicore/src/lib/os/linux/MMExtractor.cpp @@ -16,9 +16,9 @@ namespace VmiCore::Linux { } - std::unique_ptr> MMExtractor::extractAllMemoryRegions() const + std::unique_ptr> MMExtractor::extractAllMemoryRegions() const { - auto regions = std::make_unique>(); + auto regions = std::make_unique>(); for (auto area = vmiInterface->read64VA(mm, vmiInterface->convertPidToDtb(SYSTEM_PID)); area != 0; area = vmiInterface->read64VA(area + vmiInterface->getKernelStructOffset("vm_area_struct", "vm_next"), diff --git a/vmicore/src/lib/os/linux/MMExtractor.h b/vmicore/src/lib/os/linux/MMExtractor.h index b4f36afc..4608e9ea 100644 --- a/vmicore/src/lib/os/linux/MMExtractor.h +++ b/vmicore/src/lib/os/linux/MMExtractor.h @@ -16,7 +16,7 @@ namespace VmiCore::Linux const std::shared_ptr& logging, uint64_t mm); - [[nodiscard]] std::unique_ptr> extractAllMemoryRegions() const override; + [[nodiscard]] std::unique_ptr> extractAllMemoryRegions() const override; private: std::shared_ptr vmiInterface; diff --git a/vmicore/src/lib/os/windows/VadTreeWin10.cpp b/vmicore/src/lib/os/windows/VadTreeWin10.cpp index 62263c19..07dce8f5 100644 --- a/vmicore/src/lib/os/windows/VadTreeWin10.cpp +++ b/vmicore/src/lib/os/windows/VadTreeWin10.cpp @@ -22,9 +22,9 @@ namespace VmiCore::Windows { } - std::unique_ptr> VadTreeWin10::extractAllMemoryRegions() const + std::unique_ptr> VadTreeWin10::extractAllMemoryRegions() const { - auto regions = std::make_unique>(); + auto regions = std::make_unique>(); std::list nextVadEntries; std::unordered_set visitedVadVAs; auto nodeAddress = kernelAccess->extractVadTreeRootAddress(eprocessBase); diff --git a/vmicore/src/lib/os/windows/VadTreeWin10.h b/vmicore/src/lib/os/windows/VadTreeWin10.h index dba823f6..6a66288a 100644 --- a/vmicore/src/lib/os/windows/VadTreeWin10.h +++ b/vmicore/src/lib/os/windows/VadTreeWin10.h @@ -21,7 +21,7 @@ namespace VmiCore::Windows std::string processName, const std::shared_ptr& logging); - [[nodiscard]] std::unique_ptr> extractAllMemoryRegions() const override; + [[nodiscard]] std::unique_ptr> extractAllMemoryRegions() const override; private: std::shared_ptr kernelAccess; diff --git a/vmicore/test/include/vmicore_test/os/mock_MemoryRegionExtractor.h b/vmicore/test/include/vmicore_test/os/mock_MemoryRegionExtractor.h index 2ddfd5f9..98c7ab17 100644 --- a/vmicore/test/include/vmicore_test/os/mock_MemoryRegionExtractor.h +++ b/vmicore/test/include/vmicore_test/os/mock_MemoryRegionExtractor.h @@ -9,7 +9,7 @@ namespace VmiCore class MockMemoryRegionExtractor : public IMemoryRegionExtractor { public: - MOCK_METHOD(std::unique_ptr>, extractAllMemoryRegions, (), (const override)); + MOCK_METHOD(std::unique_ptr>, extractAllMemoryRegions, (), (const override)); }; }