malhuda/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2025-02-20 11:43:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fastfetch: rename FFinstance::separator to keyValueSeparator, because it's conflicted against Separator module

Browse Source
This commit is contained in:
李通洲 2023-03-09 16:43:43 +08:00
parent 161c4ac028
commit 4cf130bd07
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/init.c
View File

@ -56,8 +56,8 @@ static void defaultConfig(FFinstance* instance)
ffStrbufInit(&instance->config.colorKeys);
ffStrbufInit(&instance->config.colorTitle);
ffStrbufInit(&instance->config.separator);
ffStrbufAppendS(&instance->config.separator, ": ");
ffStrbufInit(&instance->config.keyValueSeparator);
ffStrbufAppendS(&instance->config.keyValueSeparator, ": ");
instance->config.showErrors = false;
instance->config.recache = false;
@ -317,7 +317,7 @@ static void destroyConfig(FFinstance* instance)
ffStrbufDestroy(&instance->config.logo.colors[i]);
ffStrbufDestroy(&instance->config.colorKeys);
ffStrbufDestroy(&instance->config.colorTitle);
ffStrbufDestroy(&instance->config.separator);
ffStrbufDestroy(&instance->config.keyValueSeparator);
ffDestroyOSOptions(&instance->config.os);
destroyModuleArg(&instance->config.host);

2
src/common/printing.c
View File

@ -38,7 +38,7 @@ void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t mod
if(!instance->config.pipe)
fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
ffStrbufWriteTo(&instance->config.separator, stdout);
ffStrbufWriteTo(&instance->config.keyValueSeparator, stdout);
if(!instance->config.pipe)
fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);

2
src/fastfetch.c
View File

@ -1105,7 +1105,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
else if(strcasecmp(key, "-s") == 0 || strcasecmp(key, "--structure") == 0)
optionParseString(key, value, &data->structure);
else if(strcasecmp(key, "--separator") == 0)
optionParseString(key, value, &instance->config.separator);
optionParseString(key, value, &instance->config.keyValueSeparator);
else if(strcasecmp(key, "--color-keys") == 0)
optionParseColor(key, value, &instance->config.colorKeys);
else if(strcasecmp(key, "--color-title") == 0)

2
src/fastfetch.h
View File

@ -119,7 +119,7 @@ typedef struct FFconfig
FFstrbuf colorKeys;
FFstrbuf colorTitle;
FFstrbuf separator;
FFstrbuf keyValueSeparator;
bool showErrors;
bool recache;