commit ec77caa457b5474ab530f4b8b051a9f3dea545a2
author Ed Tanous <edtanous@google.com> Fri Feb 17 10:46:06 2023 -0800
committer Ed Tanous <edtanous@google.com> Fri Feb 17 11:28:03 2023 -0800
tree e5eff5faf9296447265b8a1574d829c73f993972
parent 421cc42892e9bd8065025382a05e3858119493ef

Fix clang-tidy failures

Change-Id: I4e9e02cb57ae5eac8d7dc9f7c6e1083959170766
Signed-off-by: Ed Tanous <edtanous@google.com>

include/linux/peci-ioctl.h

diff --git a/include/linux/peci-ioctl.h b/include/linux/peci-ioctl.h
index e5b4b8b..42a9979 100644
--- a/include/linux/peci-ioctl.h
+++ b/include/linux/peci-ioctl.h
@@ -6,6 +6,10 @@
 #ifndef __PECI_IOCTL_H
 #define __PECI_IOCTL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <linux/ioctl.h>
 #include <linux/types.h>
 
@@ -660,5 +664,9 @@
 	_IOWR(PECI_IOC_BASE, PECI_CMD_CRASHDUMP_GET_FRAME, \
 	      struct peci_crashdump_get_frame_msg)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __PECI_IOCTL_H */
 // clang-format on

src/IntelCPUSensorMain.cpp

diff --git a/src/IntelCPUSensorMain.cpp b/src/IntelCPUSensorMain.cpp
index ecc36dc..10a45e8 100644
--- a/src/IntelCPUSensorMain.cpp
+++ b/src/IntelCPUSensorMain.cpp
@@ -42,9 +42,7 @@
 
 // clang-format off
 // this needs to be included last or we'll have build issues
-extern "C" {
 #include <linux/peci-ioctl.h>
-}
 #if !defined(PECI_MBX_INDEX_DDR_DIMM_TEMP)
 #define PECI_MBX_INDEX_DDR_DIMM_TEMP MBX_INDEX_DDR_DIMM_TEMP
 #endif

src/NVMeContext.hpp

diff --git a/src/NVMeContext.hpp b/src/NVMeContext.hpp
index 5be03e0..bcfa5d6 100644
--- a/src/NVMeContext.hpp
+++ b/src/NVMeContext.hpp
@@ -23,7 +23,7 @@
 
     virtual ~NVMeContext()
     {
-        close();
+        scanTimer.cancel();
     }
 
     void addSensor(const std::shared_ptr<NVMeSensor>& sensor)