unify inmemoryscanner

GDATASoftwareAG · Sep 20, 2023 · 9c17995 · 9c17995
1 parent 33ebdc8
commit 9c17995
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/plugins/inmemoryscanner/src/lib/Dumping.h b/plugins/inmemoryscanner/src/lib/Dumping.h
@@ -54,7 +54,7 @@ namespace InMemoryScanner
         {
         }
 
-        std::string getMemFileName()
+        [[nodiscard]] std::string getMemFileName()
         {
             return processName.substr(0, maxProcNameLength)
                 .append("-")
@@ -69,7 +69,7 @@ namespace InMemoryScanner
                 .append(uid);
         }
 
-        std::string toString()
+        [[nodiscard]] std::string toString()
         {
             return std::string("{")
                 .append(R"("ProcessName": ")")
@@ -155,13 +155,13 @@ namespace InMemoryScanner
         int memoryRegionCounter{};
         std::mutex counterLock{};
 
-        static std::unique_ptr<MemoryRegionInformation>
+        [[nodiscard]] static std::unique_ptr<MemoryRegionInformation>
         createMemoryRegionInformation(const std::string& processName,
                                       pid_t pid,
                                       const VmiCore::MemoryRegion& memoryRegionDescriptor,
                                       int regionId);
 
-        int getNextRegionId();
+        [[nodiscard]] int getNextRegionId();
 
         void appendRegionInfo(const std::string& regionInfo);
     };

diff --git a/plugins/inmemoryscanner/src/lib/Scanner.h b/plugins/inmemoryscanner/src/lib/Scanner.h
@@ -20,7 +20,7 @@ namespace InMemoryScanner
                 std::unique_ptr<YaraInterface> yaraEngine,
                 std::unique_ptr<IDumping> dumping);
 
-        static std::unique_ptr<std::string> getFilenameFromPath(const std::string& path);
+        [[nodiscard]] static std::unique_ptr<std::string> getFilenameFromPath(const std::string& path);
 
         void scanProcess(std::shared_ptr<const VmiCore::ActiveProcessInformation> processInformation);
 
@@ -39,7 +39,7 @@ namespace InMemoryScanner
         Semaphore<std::mutex, std::condition_variable> semaphore =
             Semaphore<std::mutex, std::condition_variable>(YR_MAX_THREADS);
 
-        bool shouldRegionBeScanned(const VmiCore::MemoryRegion& memoryRegionDescriptor);
+        [[nodiscard]] bool shouldRegionBeScanned(const VmiCore::MemoryRegion& memoryRegionDescriptor);
 
         void scanMemoryRegion(pid_t pid,
                               const std::string& processName,

diff --git a/plugins/inmemoryscanner/src/lib/Yara.h b/plugins/inmemoryscanner/src/lib/Yara.h
@@ -17,8 +17,9 @@ namespace InMemoryScanner
       private:
         YR_RULES* rules = nullptr;
 
-        static int yaraCallback(YR_SCAN_CONTEXT* context, int message, void* message_data, void* user_data);
+        [[nodiscard]] static int
+        yaraCallback(YR_SCAN_CONTEXT* context, int message, void* message_data, void* user_data);
 
-        static int handleRuleMatch(YR_SCAN_CONTEXT* context, YR_RULE* rule, std::vector<Rule>* results);
+        [[nodiscard]] static int handleRuleMatch(YR_SCAN_CONTEXT* context, YR_RULE* rule, std::vector<Rule>* results);
     };
 }
diff --git a/plugins/inmemoryscanner/src/lib/YaraInterface.h b/plugins/inmemoryscanner/src/lib/YaraInterface.h
@@ -16,7 +16,7 @@ namespace InMemoryScanner
       public:
         virtual ~YaraInterface() = default;
 
-        virtual std::unique_ptr<std::vector<Rule>> scanMemory(std::vector<uint8_t>& buffer) = 0;
+        [[nodiscard]] virtual std::unique_ptr<std::vector<Rule>> scanMemory(std::vector<uint8_t>& buffer) = 0;
 
       protected:
         YaraInterface() = default;