From 0f8ebd2269430d792e0d06b53d7087fa6a0da31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 29 Jun 2023 10:46:41 +0800 Subject: [PATCH] Bios: rename biosRelease to release --- src/detection/bios/bios.h | 2 +- src/detection/bios/bios_apple.c | 8 ++++---- src/detection/bios/bios_bsd.c | 4 ++-- src/detection/bios/bios_linux.c | 2 +- src/detection/bios/bios_windows.c | 2 +- src/modules/bios/bios.c | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/detection/bios/bios.h b/src/detection/bios/bios.h index 423ef3798..84046ad40 100644 --- a/src/detection/bios/bios.h +++ b/src/detection/bios/bios.h @@ -8,7 +8,7 @@ typedef struct FFBiosResult { FFstrbuf date; - FFstrbuf biosRelease; + FFstrbuf release; FFstrbuf vendor; FFstrbuf version; } FFBiosResult; diff --git a/src/detection/bios/bios_apple.c b/src/detection/bios/bios_apple.c index 5983a60d1..e939ac369 100644 --- a/src/detection/bios/bios_apple.c +++ b/src/detection/bios/bios_apple.c @@ -24,8 +24,8 @@ const char* ffDetectBios(FFBiosResult* bios) ffCfDictGetString(properties, CFSTR("version"), &bios->version); ffCfDictGetString(properties, CFSTR("release-date"), &bios->date); if(!ffStrbufContainC(&bios->date, '-')) - ffStrbufAppendS(&bios->biosRelease, "Efi-"); - ffStrbufAppend(&bios->biosRelease, &bios->version); + ffStrbufAppendS(&bios->release, "Efi-"); + ffStrbufAppend(&bios->release, &bios->version); CFRelease(properties); IOObjectRelease(registryEntry); @@ -52,8 +52,8 @@ const char* ffDetectBios(FFBiosResult* bios) CFMutableDictionaryRef properties; if(IORegistryEntryCreateCFProperties(registryEntry, &properties, kCFAllocatorDefault, kNilOptions) == kIOReturnSuccess) { - ffCfDictGetString(properties, CFSTR("system-firmware-version"), &bios->biosRelease); - ffStrbufAppend(&bios->version, &bios->biosRelease); + ffCfDictGetString(properties, CFSTR("system-firmware-version"), &bios->release); + ffStrbufAppend(&bios->version, &bios->release); ffStrbufSubstrAfterFirstC(&bios->version, '-'); CFRelease(properties); } diff --git a/src/detection/bios/bios_bsd.c b/src/detection/bios/bios_bsd.c index 4d8f61002..26c0dd1b5 100644 --- a/src/detection/bios/bios_bsd.c +++ b/src/detection/bios/bios_bsd.c @@ -7,8 +7,8 @@ const char* ffDetectBios(FFBiosResult* result) { ffSettingsGetFreeBSDKenv("smbios.bios.reldate", &result->date); ffCleanUpSmbiosValue(&result->date); - ffSettingsGetFreeBSDKenv("smbios.bios.revision", &result->biosRelease); - ffCleanUpSmbiosValue(&result->biosRelease); + ffSettingsGetFreeBSDKenv("smbios.bios.revision", &result->release); + ffCleanUpSmbiosValue(&result->release); ffSettingsGetFreeBSDKenv("smbios.bios.vendor", &result->vendor); ffCleanUpSmbiosValue(&result->vendor); ffSettingsGetFreeBSDKenv("smbios.bios.version", &result->version); diff --git a/src/detection/bios/bios_linux.c b/src/detection/bios/bios_linux.c index bf8427bae..fc8cba62b 100644 --- a/src/detection/bios/bios_linux.c +++ b/src/detection/bios/bios_linux.c @@ -20,7 +20,7 @@ static void getSmbiosValue(const char* devicesPath, const char* classPath, FFstr const char* ffDetectBios(FFBiosResult* bios) { getSmbiosValue("/sys/devices/virtual/dmi/id/bios_date", "/sys/class/dmi/id/bios_date", &bios->date); - getSmbiosValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &bios->biosRelease); + getSmbiosValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &bios->release); getSmbiosValue("/sys/devices/virtual/dmi/id/bios_vendor", "/sys/class/dmi/id/bios_vendor", &bios->vendor); getSmbiosValue("/sys/devices/virtual/dmi/id/bios_version", "/sys/class/dmi/id/bios_version", &bios->version); return NULL; diff --git a/src/detection/bios/bios_windows.c b/src/detection/bios/bios_windows.c index b154b290d..482ed48c2 100644 --- a/src/detection/bios/bios_windows.c +++ b/src/detection/bios/bios_windows.c @@ -18,7 +18,7 @@ const char* ffDetectBios(FFBiosResult* bios) ffRegReadUint(hKey, L"BiosMajorRelease", &major, NULL) && ffRegReadUint(hKey, L"BiosMinorRelease", &minor, NULL) ) - ffStrbufAppendF(&bios->biosRelease, "%u.%u", (unsigned)major, (unsigned)minor); + ffStrbufAppendF(&bios->release, "%u.%u", (unsigned)major, (unsigned)minor); return NULL; } diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index 53137c9b3..398a7cc83 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -10,7 +10,7 @@ void ffPrintBios(FFBiosOptions* options) { FFBiosResult bios; ffStrbufInit(&bios.date); - ffStrbufInit(&bios.biosRelease); + ffStrbufInit(&bios.release); ffStrbufInit(&bios.vendor); ffStrbufInit(&bios.version); @@ -32,15 +32,15 @@ void ffPrintBios(FFBiosOptions* options) { ffPrintLogoAndKey(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor); ffStrbufWriteTo(&bios.version, stdout); - if (bios.biosRelease.length) - printf(" (%s)", bios.biosRelease.chars); + if (bios.release.length) + printf(" (%s)", bios.release.chars); putchar('\n'); } else { ffPrintFormat(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, FF_BIOS_NUM_FORMAT_ARGS, (FFformatarg[]) { {FF_FORMAT_ARG_TYPE_STRBUF, &bios.date}, - {FF_FORMAT_ARG_TYPE_STRBUF, &bios.biosRelease}, + {FF_FORMAT_ARG_TYPE_STRBUF, &bios.release}, {FF_FORMAT_ARG_TYPE_STRBUF, &bios.vendor}, {FF_FORMAT_ARG_TYPE_STRBUF, &bios.version}, }); @@ -48,7 +48,7 @@ void ffPrintBios(FFBiosOptions* options) exit: ffStrbufDestroy(&bios.date); - ffStrbufDestroy(&bios.biosRelease); + ffStrbufDestroy(&bios.release); ffStrbufDestroy(&bios.vendor); ffStrbufDestroy(&bios.version); }