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

removed ffStrbufIsEmpty

Browse Source
This commit is contained in:
Linus Dierheimer
2021-03-23 19:48:52 +01:00
parent a0af3b0eb6
commit f61ffdb149
25 changed files with 91 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/host.c
+17 -14
View File
@@ -16,26 +16,18 @@ void ffPrintHost(FFinstance* instance)
FF_STRBUF_CREATE(host);
if(ffStrbufIsEmpty(&instance->config.hostFormat))
if(instance->config.hostFormat.length == 0)
{
ffParseFormatString(&host, &instance->config.hostFormat, 3,
(FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &family},
(FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &name},
(FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &version}
);
}
else
{
if(ffStrbufIsEmpty(&family) && ffStrbufIsEmpty(&name))
if(family.length == 0 && name.length == 0)
{
ffPrintError(instance, "Host", "neither family nor name could be determined");
return;
}
else if(ffStrbufIsEmpty(&name))
else if(name.length == 0)
{
ffStrbufAppend(&host, &family);
}
else if(ffStrbufIsEmpty(&family))
else if(family.length == 0)
{
ffStrbufAppend(&host, &name);
}
@@ -46,12 +38,23 @@ void ffPrintHost(FFinstance* instance)
ffStrbufAppend(&host, &name);
}
if(!ffStrbufIsEmpty(&version) && ffStrbufIgnCaseCompS(&version, "None") != 0)
{
if(
version.length > 0 &&
ffStrbufIgnCaseCompS(&version, "None") != 0 &&
ffStrbufIgnCaseCompS(&version, "To be filled by O.E.M.") != 0
) {
ffStrbufAppendC(&host, ' ');
ffStrbufAppend(&host, &version);
}
}
else
{
ffParseFormatString(&host, &instance->config.hostFormat, 3,
(FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &family},
(FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &name},
(FFformatarg){FF_FORMAT_ARG_TYPE_STRBUF, &version}
);
}
ffPrintAndSaveCachedValue(instance, "Host", &host);
ffStrbufDestroy(&host);