fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 00:03:58 +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:
李通洲
2023-06-24 10:59:53 +08:00
parent 48b01c9665
commit d0f093c567
255 changed files with 2020 additions and 2064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/separator/separator.c
+9 -9
View File
@@ -3,19 +3,19 @@
#include "modules/separator/separator.h"
#include "util/stringUtils.h"
void ffPrintSeparator(FFinstance* instance, FFSeparatorOptions* options)
void ffPrintSeparator(FFSeparatorOptions* options)
{
uint32_t titleLength = instance->state.titleLength;
uint32_t titleLength = instance.state.titleLength;
if (titleLength == 0)
{
// Title was not printed, should we support this case?
titleLength = instance->state.platform.userName.length + 1 + (instance->config.title.fdqn ?
instance->state.platform.domainName.length :
instance->state.platform.hostName.length
titleLength = instance.state.platform.userName.length + 1 + (instance.config.title.fdqn ?
instance.state.platform.domainName.length :
instance.state.platform.hostName.length
);
}
ffLogoPrintLine(instance);
ffLogoPrintLine();
if(options->string.length == 0)
{
@@ -59,7 +59,7 @@ void ffDestroySeparatorOptions(FFSeparatorOptions* options)
ffStrbufDestroy(&options->string);
}
void ffParseSeparatorJsonObject(FFinstance* instance, yyjson_val* module)
void ffParseSeparatorJsonObject(yyjson_val* module)
{
FFSeparatorOptions __attribute__((__cleanup__(ffDestroySeparatorOptions))) options;
ffInitSeparatorOptions(&options);
@@ -80,9 +80,9 @@ void ffParseSeparatorJsonObject(FFinstance* instance, yyjson_val* module)
continue;
}
ffPrintErrorString(instance, FF_SEPARATOR_MODULE_NAME, 0, NULL, NULL, "Unknown JSON key %s", key);
ffPrintErrorString(FF_SEPARATOR_MODULE_NAME, 0, NULL, NULL, "Unknown JSON key %s", key);
}
}
ffPrintSeparator(instance, &options);
ffPrintSeparator(&options);
}
src/modules/separator/separator.h
+2 -2
View File
@@ -4,8 +4,8 @@
#define FF_SEPARATOR_MODULE_NAME "Separator"
void ffPrintSeparator(FFinstance* instance, FFSeparatorOptions* options);
void ffPrintSeparator(FFSeparatorOptions* options);
void ffInitSeparatorOptions(FFSeparatorOptions* options);
bool ffParseSeparatorCommandOptions(FFSeparatorOptions* options, const char* key, const char* value);
void ffDestroySeparatorOptions(FFSeparatorOptions* options);
void ffParseSeparatorJsonObject(FFinstance* instance, yyjson_val* module);
void ffParseSeparatorJsonObject(yyjson_val* module);