Skip to content

Commit 5dbd6b9

Browse files
committed
Chore: remove temps_windows
1 parent 0c90941 commit 5dbd6b9

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,7 @@ elseif(WIN32)
723723
src/detection/btrfs/btrfs_nosupport.c
724724
src/detection/chassis/chassis_windows.c
725725
src/detection/cpu/cpu_windows.c
726+
src/detection/cpu/cpu_windows.cpp
726727
src/detection/cpucache/cpucache_windows.c
727728
src/detection/cpuusage/cpuusage_windows.c
728729
src/detection/cursor/cursor_windows.c
@@ -757,7 +758,6 @@ elseif(WIN32)
757758
src/detection/terminalfont/terminalfont_windows.c
758759
src/detection/terminalshell/terminalshell_windows.c
759760
src/detection/terminalsize/terminalsize_windows.c
760-
src/detection/temps/temps_windows.cpp
761761
src/detection/theme/theme_nosupport.c
762762
src/detection/uptime/uptime_windows.c
763763
src/detection/users/users_windows.c

src/detection/cpu/cpu_windows.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "cpu.h"
2-
#include "detection/temps/temps_windows.h"
32
#include "util/windows/registry.h"
43
#include "util/windows/nt.h"
54
#include "util/mallocHelper.h"
@@ -160,6 +159,8 @@ static const char* detectCoreTypes(FFCPUResult* cpu)
160159
return NULL;
161160
}
162161

162+
const char* detectThermalTemp(double* current, double* critical);
163+
163164
const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
164165
{
165166
detectNCores(cpu);
@@ -175,7 +176,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
175176
detectMaxSpeedBySmbios(cpu);
176177

177178
if(options->temp)
178-
ffDetectSmbiosTemp(&cpu->temperature, NULL);
179+
detectThermalTemp(&cpu->temperature, NULL);
179180

180181
return NULL;
181182
}

src/detection/temps/temps_windows.cpp renamed to src/detection/cpu/cpu_windows.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
extern "C"
2-
{
3-
#include "temps_windows.h"
4-
}
51
#include "util/windows/wmi.hpp"
62

73
extern "C"
8-
const char* ffDetectSmbiosTemp(double* current, double* critical)
4+
const char* detectThermalTemp(double* current, double* critical)
95
{
106
// Requires Administrator privileges
117
// https://wutils.com/wmi/root/wmi/msacpi_thermalzonetemperature/#properties

src/detection/temps/temps_windows.h

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)