From 6cf403da7d7aa7f3b36919db6d3a2949e4590499 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Tue, 31 Mar 2026 20:01:25 +0800 Subject: [PATCH] Global: renames `smbiosHelper` to `smbios` --- CMakeLists.txt | 4 ++-- src/common/impl/{smbiosHelper.c => smbios.c} | 2 +- src/common/{smbiosHelper.h => smbios.h} | 0 src/detection/battery/battery_windows.c | 2 +- src/detection/bios/bios_bsd.c | 2 +- src/detection/bios/bios_linux.c | 2 +- src/detection/bios/bios_nbsd.c | 2 +- src/detection/bios/bios_windows.c | 2 +- src/detection/board/board_bsd.c | 2 +- src/detection/board/board_linux.c | 2 +- src/detection/board/board_nbsd.c | 2 +- src/detection/board/board_windows.c | 2 +- src/detection/chassis/chassis_bsd.c | 2 +- src/detection/chassis/chassis_linux.c | 2 +- src/detection/chassis/chassis_nbsd.c | 2 +- src/detection/chassis/chassis_windows.c | 2 +- src/detection/cpu/cpu_windows.c | 2 +- src/detection/cpucache/cpucache_shared.c | 2 +- src/detection/host/host_bsd.c | 2 +- src/detection/host/host_linux.c | 2 +- src/detection/host/host_nbsd.c | 2 +- src/detection/host/host_obsd.c | 2 +- src/detection/host/host_windows.c | 2 +- src/detection/physicalmemory/physicalmemory_apple.m | 2 +- src/detection/physicalmemory/physicalmemory_linux.c | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) rename src/common/impl/{smbiosHelper.c => smbios.c} (99%) rename src/common/{smbiosHelper.h => smbios.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d51df5d8..15cfa4577 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -401,7 +401,7 @@ set(LIBFASTFETCH_SRC src/common/impl/FFstrbuf.c src/common/impl/path.c src/common/impl/FFPlatform.c - src/common/impl/smbiosHelper.c + src/common/impl/smbios.c src/detection/bluetoothradio/bluetoothradio.c src/detection/bootmgr/bootmgr.c src/detection/chassis/chassis.c @@ -860,7 +860,7 @@ elseif(OpenBSD) src/common/impl/sysctl.c src/common/impl/FFPlatform_unix.c src/common/impl/binary_linux.c - src/common/impl/smbiosHelper.c + src/common/impl/smbios.c src/common/impl/kmod_nosupport.c src/detection/battery/battery_obsd.c src/detection/bios/bios_windows.c diff --git a/src/common/impl/smbiosHelper.c b/src/common/impl/smbios.c similarity index 99% rename from src/common/impl/smbiosHelper.c rename to src/common/impl/smbios.c index a71561491..8fcfea2ca 100644 --- a/src/common/impl/smbiosHelper.c +++ b/src/common/impl/smbios.c @@ -1,4 +1,4 @@ -#include "common/smbiosHelper.h" +#include "common/smbios.h" #include "common/io.h" #include "common/unused.h" #include "common/mallocHelper.h" diff --git a/src/common/smbiosHelper.h b/src/common/smbios.h similarity index 100% rename from src/common/smbiosHelper.h rename to src/common/smbios.h diff --git a/src/detection/battery/battery_windows.c b/src/detection/battery/battery_windows.c index 41f772ceb..18194fa34 100644 --- a/src/detection/battery/battery_windows.c +++ b/src/detection/battery/battery_windows.c @@ -4,7 +4,7 @@ #include "common/windows/nt.h" #include "common/windows/unicode.h" #include "common/mallocHelper.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" #undef WIN32_LEAN_AND_MEAN #include diff --git a/src/detection/bios/bios_bsd.c b/src/detection/bios/bios_bsd.c index 7911399d2..66e50ea51 100644 --- a/src/detection/bios/bios_bsd.c +++ b/src/detection/bios/bios_bsd.c @@ -3,7 +3,7 @@ #include "common/settings.h" #include "common/sysctl.h" #include "common/io.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectBios(FFBiosResult* result) { ffSettingsGetFreeBSDKenv("smbios.bios.reldate", &result->date); diff --git a/src/detection/bios/bios_linux.c b/src/detection/bios/bios_linux.c index 0661df485..8776631e2 100644 --- a/src/detection/bios/bios_linux.c +++ b/src/detection/bios/bios_linux.c @@ -1,6 +1,6 @@ #include "bios.h" #include "common/io.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectBios(FFBiosResult* bios) { if (ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_date", "/sys/class/dmi/id/bios_date", &bios->date)) { diff --git a/src/detection/bios/bios_nbsd.c b/src/detection/bios/bios_nbsd.c index 650862ce0..73b56ceed 100644 --- a/src/detection/bios/bios_nbsd.c +++ b/src/detection/bios/bios_nbsd.c @@ -1,6 +1,6 @@ #include "bios.h" #include "common/sysctl.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectBios(FFBiosResult* bios) { if (ffSysctlGetString("machdep.dmi.bios-date", &bios->date) == NULL) { diff --git a/src/detection/bios/bios_windows.c b/src/detection/bios/bios_windows.c index 28271185f..993278abe 100644 --- a/src/detection/bios/bios_windows.c +++ b/src/detection/bios/bios_windows.c @@ -1,5 +1,5 @@ #include "bios.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" #ifdef _WIN32 # include "common/windows/registry.h" diff --git a/src/detection/board/board_bsd.c b/src/detection/board/board_bsd.c index c27a469f0..2e0e41720 100644 --- a/src/detection/board/board_bsd.c +++ b/src/detection/board/board_bsd.c @@ -1,6 +1,6 @@ #include "board.h" #include "common/settings.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectBoard(FFBoardResult* result) { ffSettingsGetFreeBSDKenv("smbios.planar.product", &result->name); diff --git a/src/detection/board/board_linux.c b/src/detection/board/board_linux.c index f560df05a..52b3df2cd 100644 --- a/src/detection/board/board_linux.c +++ b/src/detection/board/board_linux.c @@ -1,6 +1,6 @@ #include "board.h" #include "common/io.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectBoard(FFBoardResult* board) { if (ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->name)) { diff --git a/src/detection/board/board_nbsd.c b/src/detection/board/board_nbsd.c index a78dbb493..cc3ff938d 100644 --- a/src/detection/board/board_nbsd.c +++ b/src/detection/board/board_nbsd.c @@ -1,6 +1,6 @@ #include "board.h" #include "common/sysctl.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectBoard(FFBoardResult* board) { if (ffSysctlGetString("machdep.dmi.board-product", &board->name) == NULL) { diff --git a/src/detection/board/board_windows.c b/src/detection/board/board_windows.c index f731fe336..388e0675c 100644 --- a/src/detection/board/board_windows.c +++ b/src/detection/board/board_windows.c @@ -1,5 +1,5 @@ #include "board.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" typedef struct FFSmbiosBaseboard { FFSmbiosHeader Header; diff --git a/src/detection/chassis/chassis_bsd.c b/src/detection/chassis/chassis_bsd.c index 12572817c..fa1371890 100644 --- a/src/detection/chassis/chassis_bsd.c +++ b/src/detection/chassis/chassis_bsd.c @@ -1,6 +1,6 @@ #include "chassis.h" #include "common/settings.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectChassis(FFChassisResult* result) { // Unlike other platforms, `smbios.chassis.type` return display string directly on my machine diff --git a/src/detection/chassis/chassis_linux.c b/src/detection/chassis/chassis_linux.c index 648365569..af7ed0a1e 100644 --- a/src/detection/chassis/chassis_linux.c +++ b/src/detection/chassis/chassis_linux.c @@ -1,6 +1,6 @@ #include "chassis.h" #include "common/io.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" #include diff --git a/src/detection/chassis/chassis_nbsd.c b/src/detection/chassis/chassis_nbsd.c index f3f240d74..56447982d 100644 --- a/src/detection/chassis/chassis_nbsd.c +++ b/src/detection/chassis/chassis_nbsd.c @@ -1,6 +1,6 @@ #include "chassis.h" #include "common/sysctl.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectChassis(FFChassisResult* chassis) { if (ffSysctlGetString("machdep.dmi.chassis-type", &chassis->type) == NULL) { diff --git a/src/detection/chassis/chassis_windows.c b/src/detection/chassis/chassis_windows.c index f4e4f09b9..34b7fd05a 100644 --- a/src/detection/chassis/chassis_windows.c +++ b/src/detection/chassis/chassis_windows.c @@ -1,5 +1,5 @@ #include "chassis.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" // 7.4 typedef struct FFSmbiosSystemEnclosure { diff --git a/src/detection/cpu/cpu_windows.c b/src/detection/cpu/cpu_windows.c index f29b60477..ef9801a09 100644 --- a/src/detection/cpu/cpu_windows.c +++ b/src/detection/cpu/cpu_windows.c @@ -2,7 +2,7 @@ #include "common/windows/registry.h" #include "common/windows/nt.h" #include "common/mallocHelper.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" #include #include "common/windows/perflib_.h" diff --git a/src/detection/cpucache/cpucache_shared.c b/src/detection/cpucache/cpucache_shared.c index 32b64e596..a712e8d70 100644 --- a/src/detection/cpucache/cpucache_shared.c +++ b/src/detection/cpucache/cpucache_shared.c @@ -1,5 +1,5 @@ #include "cpucache.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" #include "common/stringUtils.h" typedef struct FFSmbiosCacheInfo { diff --git a/src/detection/host/host_bsd.c b/src/detection/host/host_bsd.c index f6941307c..3eb547d1b 100644 --- a/src/detection/host/host_bsd.c +++ b/src/detection/host/host_bsd.c @@ -1,6 +1,6 @@ #include "host.h" #include "common/settings.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectHost(FFHostResult* host) { ffSettingsGetFreeBSDKenv("smbios.system.product", &host->name); diff --git a/src/detection/host/host_linux.c b/src/detection/host/host_linux.c index 1cbc467cd..3d4d04ba8 100644 --- a/src/detection/host/host_linux.c +++ b/src/detection/host/host_linux.c @@ -1,7 +1,7 @@ #include "host.h" #include "common/io.h" #include "common/processing.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" #include diff --git a/src/detection/host/host_nbsd.c b/src/detection/host/host_nbsd.c index 47dc24561..a5a29d289 100644 --- a/src/detection/host/host_nbsd.c +++ b/src/detection/host/host_nbsd.c @@ -1,6 +1,6 @@ #include "host.h" #include "common/sysctl.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectHost(FFHostResult* host) { const char* error = NULL; diff --git a/src/detection/host/host_obsd.c b/src/detection/host/host_obsd.c index c51765e87..cb16ecf39 100644 --- a/src/detection/host/host_obsd.c +++ b/src/detection/host/host_obsd.c @@ -1,6 +1,6 @@ #include "host.h" #include "common/sysctl.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" const char* ffDetectHost(FFHostResult* host) { const char* error = NULL; diff --git a/src/detection/host/host_windows.c b/src/detection/host/host_windows.c index e04125ecd..42b218423 100644 --- a/src/detection/host/host_windows.c +++ b/src/detection/host/host_windows.c @@ -1,5 +1,5 @@ #include "host.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" typedef struct FFSmbiosSystemInfo { FFSmbiosHeader Header; diff --git a/src/detection/physicalmemory/physicalmemory_apple.m b/src/detection/physicalmemory/physicalmemory_apple.m index b80c8e424..3300fa926 100644 --- a/src/detection/physicalmemory/physicalmemory_apple.m +++ b/src/detection/physicalmemory/physicalmemory_apple.m @@ -1,6 +1,6 @@ #include "physicalmemory.h" #include "common/processing.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" #include "common/stringUtils.h" #include "common/apple/cf_helpers.h" diff --git a/src/detection/physicalmemory/physicalmemory_linux.c b/src/detection/physicalmemory/physicalmemory_linux.c index 7e71316b6..a032165c5 100644 --- a/src/detection/physicalmemory/physicalmemory_linux.c +++ b/src/detection/physicalmemory/physicalmemory_linux.c @@ -1,5 +1,5 @@ #include "physicalmemory.h" -#include "common/smbiosHelper.h" +#include "common/smbios.h" // 7.18 typedef struct FFSmbiosMemoryDevice {