fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Bios: rename biosRelease to release

Browse Source
This commit is contained in:
李通洲
2023-06-29 10:46:41 +08:00
parent 13f58f5f1b
commit 0f8ebd2269
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/bios/bios.h
+1 -1
View File
@@ -8,7 +8,7 @@
typedef struct FFBiosResult
{
FFstrbuf date;
FFstrbuf biosRelease;
FFstrbuf release;
FFstrbuf vendor;
FFstrbuf version;
} FFBiosResult;
src/detection/bios/bios_apple.c
+4 -4
View File
@@ -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);
}
src/detection/bios/bios_bsd.c
+2 -2
View File
@@ -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);
src/detection/bios/bios_linux.c
+1 -1
View File
@@ -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;
src/detection/bios/bios_windows.c
+1 -1
View File
@@ -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;
}
src/modules/bios/bios.c
+5 -5
View File
@@ -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);
}