From 6063f8da997247d68aec9422e39c93458f18bba0 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 22 Dec 2023 20:42:04 +0100
Subject: [PATCH] applies clang-tidy fixes

---
 src/sysc/scc/configurer.cpp           |  2 +-
 src/sysc/scc/scv/scv_tr_sqlite.cpp    |  2 +-
 src/sysc/scc/utilities.h              | 29 +++++++++++++++------------
 third_party/axi_chi                   |  2 +-
 third_party/cci-1.0.0/CMakeLists.txt  |  2 ++
 third_party/scv-tr/src/CMakeLists.txt |  1 +
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/sysc/scc/configurer.cpp b/src/sysc/scc/configurer.cpp
index 9ab85da6..32ff323a 100644
--- a/src/sysc/scc/configurer.cpp
+++ b/src/sysc/scc/configurer.cpp
@@ -239,7 +239,7 @@ struct json_config_reader : public config_reader {
             for(auto itr = o.MemberBegin(); itr != o.MemberEnd(); ++itr) {
                 if(!itr->name.IsString())
                     return;
-                auto key_name = itr->name.GetString();
+                std::string key_name = itr->name.GetString();
                 Value const& val = itr->value;
                 auto hier_name = prefix.size() ? prefix + "." + key_name : key_name;
                 if(val.IsNull() || val.IsArray())
diff --git a/src/sysc/scc/scv/scv_tr_sqlite.cpp b/src/sysc/scc/scv/scv_tr_sqlite.cpp
index c9eaf896..d200b206 100644
--- a/src/sysc/scc/scv/scv_tr_sqlite.cpp
+++ b/src/sysc/scc/scv/scv_tr_sqlite.cpp
@@ -58,7 +58,7 @@ class SQLiteDB {
         if(nRet != SQLITE_OK)
             throw SQLiteException(nRet, sqlite3_errmsg(db), false);
         sqlite3_busy_timeout(db, busyTimeoutMs);
-        nRet = sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, 1ULL << 26, 1ULL << 30);
+        sqlite3_config(SQLITE_CONFIG_MMAP_SIZE, 1ULL << 26, 1ULL << 30);
         char* zSql = sqlite3_mprintf("PRAGMA journal_mode=OFF;\n"
                                      "PRAGMA synchronous=OFF;\n");
         char* zErrMsg = nullptr;
diff --git a/src/sysc/scc/utilities.h b/src/sysc/scc/utilities.h
index 43ffabab..a70f7fbe 100644
--- a/src/sysc/scc/utilities.h
+++ b/src/sysc/scc/utilities.h
@@ -279,19 +279,22 @@ inline sc_core::sc_time parse_from_string(std::string value) noexcept {
 }
 
 inline sc_core::sc_time time_to_next_posedge(sc_core::sc_clock const* clk) {
-    auto period = clk->period();
-    auto m_posedge_time = period - period * clk->duty_cycle();
-    auto clk_run_time = sc_core::sc_time_stamp() - clk->start_time();
-    auto clk_period_point = clk_run_time % period;
-    if(clk_period_point == sc_core::SC_ZERO_TIME)
-        clk_period_point = period;
-    if(clk->posedge_first())
-        return clk_period_point;
-    else if(clk_period_point < m_posedge_time) {
-        return m_posedge_time - clk_period_point;
-    } else {
-        return period + m_posedge_time - clk_period_point;
-    }
+    if(clk) {
+        auto period = clk->period();
+        auto m_posedge_time = period - period * clk->duty_cycle();
+        auto clk_run_time = sc_core::sc_time_stamp() - clk->start_time();
+        auto clk_period_point = clk_run_time % period;
+        if(clk_period_point == sc_core::SC_ZERO_TIME)
+            clk_period_point = period;
+        if(clk->posedge_first())
+            return clk_period_point;
+        else if(clk_period_point < m_posedge_time) {
+            return m_posedge_time - clk_period_point;
+        } else {
+            return period + m_posedge_time - clk_period_point;
+        }
+    } else
+        return sc_core::SC_ZERO_TIME;
 }
 
 #if __cplusplus < 201402L
diff --git a/third_party/axi_chi b/third_party/axi_chi
index 62d6096f..e335cc36 160000
--- a/third_party/axi_chi
+++ b/third_party/axi_chi
@@ -1 +1 @@
-Subproject commit 62d6096f82f10aca693adc0fc6544a39067742e8
+Subproject commit e335cc36f7bd7cff7522fbf83740140713ec909c
diff --git a/third_party/cci-1.0.0/CMakeLists.txt b/third_party/cci-1.0.0/CMakeLists.txt
index 71351f6c..9bbcb3f8 100644
--- a/third_party/cci-1.0.0/CMakeLists.txt
+++ b/third_party/cci-1.0.0/CMakeLists.txt
@@ -41,7 +41,9 @@ set_target_properties(cciapi PROPERTIES
     VERSION ${PROJECT_VERSION}
     FRAMEWORK FALSE
     PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/cci_configuration
+    CXX_CLANG_TIDY ""
 )
+
 set(CCIAPI_CMAKE_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/cciapi)
 install(TARGETS cciapi COMPONENT cci EXPORT cciapi-targets
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/third_party/scv-tr/src/CMakeLists.txt b/third_party/scv-tr/src/CMakeLists.txt
index 4f489dc7..b597a517 100644
--- a/third_party/scv-tr/src/CMakeLists.txt
+++ b/third_party/scv-tr/src/CMakeLists.txt
@@ -41,6 +41,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
     VERSION ${PROJECT_VERSION}
     FRAMEWORK FALSE
     PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/scv-tr.h
+    CXX_CLANG_TIDY ""
 )
 
 install(TARGETS ${PROJECT_NAME} COMPONENT scv-tr EXPORT ${PROJECT_NAME}-targets