Pull request #3716: main: fix const issues causing compile warnings

Merge in SNORT/snort3 from XTLS/snort3:fix_const to master

Squashed commit of the following:

commit ea95013da782eb675ac52aa6b022aeaa207bc29f
Author: Brian Morris <bmorris2@cisco.com>
Date:   Thu Dec 22 20:02:07 2022 +0000

    main: fix const issues causing compile warnings

diff --git a/src/main/thread_config.cc b/src/main/thread_config.cc
index dbcb88cc115bc41a66b1979a4175f11d744df64b..0051ae972dcb64fcb2e7fbf65fde0ce6e7c08f0d 100644 (file)
--- a/src/main/thread_config.cc
+++ b/src/main/thread_config.cc
@@ -162,17 +162,17 @@ void ThreadConfig::set_named_thread_affinity(const string& name, CpuSet* cpuset)
         ParseWarning(WARN_CONF, "This platform does not support setting thread affinity.\n");
 }
 
-void ThreadConfig::set_instance_tid(const int id, const int tid)
+void ThreadConfig::set_instance_tid(int id, int tid)
 {
     instance_id_to_tid.emplace(id,tid);
 }
 
-const int ThreadConfig::get_instance_tid(const int id)
+int ThreadConfig::get_instance_tid(int id) const
 {
     int ret = -1;
     auto iter = instance_id_to_tid.find(id);
     if ( iter != instance_id_to_tid.end() )
-        ret = instance_id_to_tid.at(id);
+        ret = iter->second;
     return ret;
 }
 

diff --git a/src/main/thread_config.h b/src/main/thread_config.h
index 0acc082c25613a44e65f542b66d21d20cdc77739..602f6a03868287486b279787ce6d6cc887032fce 100644 (file)
--- a/src/main/thread_config.h
+++ b/src/main/thread_config.h
@@ -45,8 +45,8 @@ public:
     void set_named_thread_affinity(const std::string&, CpuSet*);
     void implement_thread_affinity(SThreadType, unsigned id);
     void implement_named_thread_affinity(const std::string& name);
-    void set_instance_tid(const int, const int);
-    const int get_instance_tid(const int);
+    void set_instance_tid(int, int);
+    int get_instance_tid(int) const;
 
     static constexpr unsigned int DEFAULT_THREAD_ID = 0;