fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 16:26:39 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Chassis: refactor

Browse Source
This commit is contained in:
李通洲
2023-06-16 16:33:43 +08:00
committed by CarterLi
parent 4360450ac6
commit 5483cb9143
5 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/chassis/chassis.h
+1 -2
View File
@@ -10,9 +10,8 @@ typedef struct FFChassisResult
FFstrbuf chassisType;
FFstrbuf chassisVendor;
FFstrbuf chassisVersion;
FFstrbuf error;
} FFChassisResult;
void ffDetectChassis(FFChassisResult* result);
const char* ffDetectChassis(FFChassisResult* result);
#endif
src/detection/chassis/chassis_bsd.c
+2 -5
View File
@@ -1,13 +1,10 @@
#include "chassis.h"
#include "common/settings.h"
void ffDetectChassis(FFChassisResult* result)
const char* ffDetectChassis(FFChassisResult* result)
{
ffStrbufInit(&result->error);
ffStrbufInit(&result->chassisType);
ffStrbufInit(&result->chassisVendor);
ffStrbufInit(&result->chassisVersion);
ffSettingsGetFreeBSDKenv("smbios.chassis.type", &result->chassisType);
ffSettingsGetFreeBSDKenv("smbios.chassis.maker", &result->chassisVendor);
ffSettingsGetFreeBSDKenv("smbios.chassis.version", &result->chassisVersion);
return NULL;
}
src/detection/chassis/chassis_linux.c
+2 -8
View File
@@ -40,16 +40,10 @@ static void getHostValue(const char* devicesPath, const char* classPath, FFstrbu
ffStrbufClear(buffer);
}
void ffDetectChassis(FFChassisResult* result)
const char* ffDetectChassis(FFChassisResult* result)
{
ffStrbufInit(&result->error);
ffStrbufInit(&result->chassisType);
getHostValue("/sys/devices/virtual/dmi/id/chassis_type", "/sys/class/dmi/id/chassis_type", &result->chassisType);
ffStrbufInit(&result->chassisVendor);
getHostValue("/sys/devices/virtual/dmi/id/chassis_vendor", "/sys/class/dmi/id/chassis_vendor", &result->chassisVendor);
ffStrbufInit(&result->chassisVersion);
getHostValue("/sys/devices/virtual/dmi/id/chassis_version", "/sys/class/dmi/id/chassis_version", &result->chassisVersion);
return NULL;
}
src/detection/chassis/chassis_nosupport.c
+2 -6
View File
@@ -1,10 +1,6 @@
#include "chassis.h"
void ffDetectChassis(FFChassisResult* result)
const char* ffDetectChassis(FF_MAYBE_UNUSED FFChassisResult* result)
{
ffStrbufInitS(&result->error, "Not supported on this platform");
ffStrbufInit(&result->chassisType);
ffStrbufInit(&result->chassisVendor);
ffStrbufInit(&result->chassisVersion);
return "Not supported on this platform";
}