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

Global: make FFinstance instance a global variable

Browse Source 
As discussed in https://github.com/fastfetch-cli/fastfetch/discussions/473
This commit is contained in:
李通洲 committed 2023-06-24 17:28:05 +08:00
1 parent 48b01c9665
commit d0f093c567
255 files changed
+2020 -2064
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/detection/os/os_linux.c
+6 -6
View File
@@ -94,15 +94,15 @@ static void getUbuntuFlavour(FFOSResult* result)
}
}
static void detectOS(FFOSResult* os, const FFinstance* instance)
static void detectOS(FFOSResult* os)
{
if(instance->config.osFile.length > 0)
if(instance.config.osFile.length > 0)
{
parseFile(instance->config.osFile.chars, os);
parseFile(instance.config.osFile.chars, os);
return;
}
if(instance->config.escapeBedrock && parseFile(FASTFETCH_TARGET_DIR_ROOT"/bedrock"FASTFETCH_TARGET_DIR_ETC"/bedrock-release", os))
if(instance.config.escapeBedrock && parseFile(FASTFETCH_TARGET_DIR_ROOT"/bedrock"FASTFETCH_TARGET_DIR_ETC"/bedrock-release", os))
{
if(os->id.length == 0)
ffStrbufAppendS(&os->id, "bedrock");
@@ -127,7 +127,7 @@ static void detectOS(FFOSResult* os, const FFinstance* instance)
parseFile(FASTFETCH_TARGET_DIR_ETC"/lsb-release", os);
}
void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance)
void ffDetectOSImpl(FFOSResult* os)
{
ffStrbufInit(&os->name);
ffStrbufInit(&os->prettyName);
@@ -140,7 +140,7 @@ void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance)
ffStrbufInit(&os->codename);
ffStrbufInit(&os->buildID);
detectOS(os, instance);
detectOS(os);
if(ffStrbufIgnCaseCompS(&os->id, "ubuntu") == 0)
getUbuntuFlavour(os);