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

Board: code refactor

Browse Source
This commit is contained in:
李通洲
2023-06-22 22:32:14 +08:00
parent a35d1a32ea
commit e4e5560b75
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/board/board.h
+3 -3
View File
@@ -7,9 +7,9 @@
typedef struct FFBoardResult
{
FFstrbuf boardName;
FFstrbuf boardVendor;
FFstrbuf boardVersion;
FFstrbuf name;
FFstrbuf vendor;
FFstrbuf version;
} FFBoardResult;
const char* ffDetectBoard(FFBoardResult* result);
src/detection/board/board_bsd.c
+6 -6
View File
@@ -4,11 +4,11 @@
const char* ffDetectBoard(FFBoardResult* result)
{
ffSettingsGetFreeBSDKenv("smbios.planar.product", &result->boardName);
ffCleanUpSmbiosValue(&result->boardName);
ffSettingsGetFreeBSDKenv("smbios.planar.maker", &result->boardVendor);
ffCleanUpSmbiosValue(&result->boardVendor);
ffSettingsGetFreeBSDKenv("smbios.planar.version", &result->boardVersion);
ffCleanUpSmbiosValue(&result->boardVersion);
ffSettingsGetFreeBSDKenv("smbios.planar.product", &result->name);
ffCleanUpSmbiosValue(&result->name);
ffSettingsGetFreeBSDKenv("smbios.planar.maker", &result->vendor);
ffCleanUpSmbiosValue(&result->vendor);
ffSettingsGetFreeBSDKenv("smbios.planar.version", &result->version);
ffCleanUpSmbiosValue(&result->version);
return NULL;
}
src/detection/board/board_linux.c
+3 -3
View File
@@ -19,8 +19,8 @@ static void getSmbiosValue(const char* devicesPath, const char* classPath, FFstr
const char* ffDetectBoard(FFBoardResult* board)
{
getSmbiosValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->boardName);
getSmbiosValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &board->boardVendor);
getSmbiosValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &board->boardVersion);
getSmbiosValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->name);
getSmbiosValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &board->vendor);
getSmbiosValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &board->version);
return NULL;
}
src/detection/board/board_windows.c
+3 -3
View File
@@ -8,11 +8,11 @@ const char* ffDetectBoard(FFBoardResult* board)
if(!ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System\\BIOS", &hKey, NULL))
return "ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L\"HARDWARE\\DESCRIPTION\\System\\BIOS\") failed";
if(!ffRegReadStrbuf(hKey, L"BaseBoardProduct", &board->boardName, NULL))
if(!ffRegReadStrbuf(hKey, L"BaseBoardProduct", &board->name, NULL))
return "ffRegReadStrbuf(hKey, L\"BaseBoardProduct\") failed";
ffRegReadStrbuf(hKey, L"BaseBoardManufacturer", &board->boardVendor, NULL);
ffRegReadStrbuf(hKey, L"BaseBoardVersion", &board->boardVersion, NULL);
ffRegReadStrbuf(hKey, L"BaseBoardManufacturer", &board->vendor, NULL);
ffRegReadStrbuf(hKey, L"BaseBoardVersion", &board->version, NULL);
return NULL;
}
src/modules/board/board.c
+13 -13
View File
@@ -9,9 +9,9 @@
void ffPrintBoard(FFinstance* instance, FFBoardOptions* options)
{
FFBoardResult result;
ffStrbufInit(&result.boardName);
ffStrbufInit(&result.boardVendor);
ffStrbufInit(&result.boardVersion);
ffStrbufInit(&result.name);
ffStrbufInit(&result.vendor);
ffStrbufInit(&result.version);
const char* error = ffDetectBoard(&result);
if(error)
@@ -20,7 +20,7 @@ void ffPrintBoard(FFinstance* instance, FFBoardOptions* options)
goto exit;
}
if(result.boardName.length == 0)
if(result.name.length == 0)
{
ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "board_name is not set.");
goto exit;
@@ -29,24 +29,24 @@ void ffPrintBoard(FFinstance* instance, FFBoardOptions* options)
if(options->moduleArgs.outputFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs.key, &options->moduleArgs.keyColor);
ffStrbufWriteTo(&result.boardName, stdout);
if (result.boardVersion.length)
printf(" (%s)", result.boardVersion.chars);
ffStrbufWriteTo(&result.name, stdout);
if (result.version.length)
printf(" (%s)", result.version.chars);
putchar('\n');
}
else
{
ffPrintFormat(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_BOARD_NUM_FORMAT_ARGS, (FFformatarg[]) {
{FF_FORMAT_ARG_TYPE_STRBUF, &result.boardName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVendor},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVersion},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.name},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.vendor},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.version},
});
}
exit:
ffStrbufDestroy(&result.boardName);
ffStrbufDestroy(&result.boardVendor);
ffStrbufDestroy(&result.boardVersion);
ffStrbufDestroy(&result.name);
ffStrbufDestroy(&result.vendor);
ffStrbufDestroy(&result.version);
}
void ffInitBoardOptions(FFBoardOptions* options)