From 54bd4346ece36cc84e25b259296349bd354cc015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Wed, 27 Dec 2023 08:46:49 +0800
Subject: [PATCH] Temps (macOS): rename functions

---
 src/detection/battery/battery_apple.c |  2 +-
 src/detection/cpu/cpu_apple.c         |  8 ++++----
 src/detection/gpu/gpu_apple.c         | 12 ++++++------
 src/detection/temps/temps_apple.c     |  2 +-
 src/detection/temps/temps_apple.h     |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/detection/battery/battery_apple.c b/src/detection/battery/battery_apple.c
index 213cef853..f301297f1 100644
--- a/src/detection/battery/battery_apple.c
+++ b/src/detection/battery/battery_apple.c
@@ -77,7 +77,7 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
             if (!ffCfDictGetInt64(properties, CFSTR("Temperature"), &temp))
                 battery->temperature = (double) temp / 10 - 273.15;
             else
-                ffDetectCoreTemps(FF_TEMP_BATTERY, &battery->temperature);
+                ffDetectSmcTemps(FF_TEMP_BATTERY, &battery->temperature);
         }
 
         IOObjectRelease(registryEntry);
diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c
index e75dbc1c8..a0afaa697 100644
--- a/src/detection/cpu/cpu_apple.c
+++ b/src/detection/cpu/cpu_apple.c
@@ -11,14 +11,14 @@ static double detectCpuTemp(const FFstrbuf* cpuName)
     {
         switch (strtol(cpuName->chars + strlen("Apple M"), NULL, 10))
         {
-            case 1: error = ffDetectCoreTemps(FF_TEMP_CPU_M1X, &result); break;
-            case 2: error = ffDetectCoreTemps(FF_TEMP_CPU_M2X, &result); break;
-            case 3: error = ffDetectCoreTemps(FF_TEMP_CPU_M3X, &result); break;
+            case 1: error = ffDetectSmcTemps(FF_TEMP_CPU_M1X, &result); break;
+            case 2: error = ffDetectSmcTemps(FF_TEMP_CPU_M2X, &result); break;
+            case 3: error = ffDetectSmcTemps(FF_TEMP_CPU_M3X, &result); break;
             default: error = "Unsupported Apple Silicon CPU";
         }
     }
     else // PPC?
-        error = ffDetectCoreTemps(FF_TEMP_CPU_X64, &result);
+        error = ffDetectSmcTemps(FF_TEMP_CPU_X64, &result);
 
     if(error)
         return FF_CPU_TEMP_UNSET;
diff --git a/src/detection/gpu/gpu_apple.c b/src/detection/gpu/gpu_apple.c
index bed558631..4b164bac2 100644
--- a/src/detection/gpu/gpu_apple.c
+++ b/src/detection/gpu/gpu_apple.c
@@ -15,18 +15,18 @@ static double detectGpuTemp(const FFstrbuf* gpuName)
     {
         switch (strtol(gpuName->chars + strlen("Apple M"), NULL, 10))
         {
-            case 1: error = ffDetectCoreTemps(FF_TEMP_GPU_M1X, &result); break;
-            case 2: error = ffDetectCoreTemps(FF_TEMP_GPU_M2X, &result); break;
-            case 3: error = ffDetectCoreTemps(FF_TEMP_GPU_M3X, &result); break;
+            case 1: error = ffDetectSmcTemps(FF_TEMP_GPU_M1X, &result); break;
+            case 2: error = ffDetectSmcTemps(FF_TEMP_GPU_M2X, &result); break;
+            case 3: error = ffDetectSmcTemps(FF_TEMP_GPU_M3X, &result); break;
             default: error = "Unsupported Apple Silicon GPU";
         }
     }
     else if (ffStrbufStartsWithS(gpuName, "Intel"))
-        error = ffDetectCoreTemps(FF_TEMP_GPU_INTEL, &result);
+        error = ffDetectSmcTemps(FF_TEMP_GPU_INTEL, &result);
     else if (ffStrbufStartsWithS(gpuName, "Radeon") || ffStrbufStartsWithS(gpuName, "AMD"))
-        error = ffDetectCoreTemps(FF_TEMP_GPU_AMD, &result);
+        error = ffDetectSmcTemps(FF_TEMP_GPU_AMD, &result);
     else
-        error = ffDetectCoreTemps(FF_TEMP_GPU_UNKNOWN, &result);
+        error = ffDetectSmcTemps(FF_TEMP_GPU_UNKNOWN, &result);
 
     if (error)
         return FF_GPU_TEMP_UNSET;
diff --git a/src/detection/temps/temps_apple.c b/src/detection/temps/temps_apple.c
index ba66c6433..2fbc2ae09 100644
--- a/src/detection/temps/temps_apple.c
+++ b/src/detection/temps/temps_apple.c
@@ -287,7 +287,7 @@ static bool detectTemp(io_connect_t conn, const char *sensor, double* sum)
     return true;
 }
 
-const char *ffDetectCoreTemps(enum FFTempType type, double *result)
+const char *ffDetectSmcTemps(enum FFTempType type, double *result)
 {
     static io_connect_t conn;
     static dispatch_once_t once_control;
diff --git a/src/detection/temps/temps_apple.h b/src/detection/temps/temps_apple.h
index ccf914311..c04b41569 100644
--- a/src/detection/temps/temps_apple.h
+++ b/src/detection/temps/temps_apple.h
@@ -29,4 +29,4 @@ enum FFTempType
     FF_TEMP_MEMORY,
 };
 
-const char *ffDetectCoreTemps(enum FFTempType type, double* result);
+const char *ffDetectSmcTemps(enum FFTempType type, double* result);