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

Global: use ffStrbufInitStatic

Browse Source
This commit is contained in:
李通洲
2023-07-25 16:09:09 +08:00
committed by 李通洲
parent 309d1d2130
commit 841be619ba
8 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/init.c
+1 -1
View File
@@ -36,7 +36,7 @@ static void defaultConfig(void)
ffStrbufInit(&instance.config.colorKeys);
ffStrbufInit(&instance.config.colorTitle);
ffStrbufInitS(&instance.config.keyValueSeparator, ": ");
ffStrbufInitStatic(&instance.config.keyValueSeparator, ": ");
instance.config.processingTimeout = 1000;
#if defined(__linux__) || defined(__FreeBSD__)
src/detection/displayserver/displayserver_apple.c
+3 -4
View File
@@ -103,8 +103,8 @@ static void detectWMPlugin(FFstrbuf* name)
void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
{
ffStrbufInitS(&ds->wmProcessName, "WindowServer");
ffStrbufInitS(&ds->wmPrettyName, "Quartz Compositor");
ffStrbufInitStatic(&ds->wmProcessName, "WindowServer");
ffStrbufInitStatic(&ds->wmPrettyName, "Quartz Compositor");
ffStrbufInit(&ds->wmProtocolName);
if(instance.config.allowSlowOperations)
@@ -117,9 +117,8 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
}
ffStrbufInit(&ds->deProcessName);
ffStrbufInit(&ds->dePrettyName);
ffStrbufInitStatic(&ds->dePrettyName, "Aqua");
ffStrbufInit(&ds->deVersion);
ffStrbufAppendS(&ds->dePrettyName, "Aqua");
ffListInitA(&ds->displays, sizeof(FFDisplayResult), 4);
detectDisplays(ds);
src/detection/displayserver/displayserver_windows.c
+7 -7
View File
@@ -145,13 +145,13 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
BOOL enabled;
if(SUCCEEDED(DwmIsCompositionEnabled(&enabled)) && enabled == TRUE)
{
ffStrbufInitS(&ds->wmProcessName, "dwm.exe");
ffStrbufInitS(&ds->wmPrettyName, "Desktop Window Manager");
ffStrbufInitStatic(&ds->wmProcessName, "dwm.exe");
ffStrbufInitStatic(&ds->wmPrettyName, "Desktop Window Manager");
}
else
{
ffStrbufInitS(&ds->wmProcessName, "internal");
ffStrbufInitS(&ds->wmPrettyName, "internal");
ffStrbufInitStatic(&ds->wmProcessName, "explorer.exe");
ffStrbufInitStatic(&ds->wmPrettyName, "Windows Explorer");
}
ffStrbufInit(&ds->wmProtocolName);
ffStrbufInit(&ds->deProcessName);
@@ -169,13 +169,13 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
ffStrbufEqualS(&os->version, "2022") ||
ffStrbufEqualS(&os->version, "2019") ||
ffStrbufEqualS(&os->version, "2016")
) ffStrbufSetS(&ds->dePrettyName, "Fluent");
) ffStrbufSetStatic(&ds->dePrettyName, "Fluent");
else if(
ffStrbufEqualS(&os->version, "8") ||
ffStrbufEqualS(&os->version, "8.1") ||
ffStrbufEqualS(&os->version, "2012 R2") ||
ffStrbufEqualS(&os->version, "2012")
) ffStrbufSetS(&ds->dePrettyName, "Metro");
) ffStrbufSetStatic(&ds->dePrettyName, "Metro");
else
ffStrbufSetS(&ds->dePrettyName, "Aero");
ffStrbufSetStatic(&ds->dePrettyName, "Aero");
}
src/detection/os/os_android.c
+3 -3
View File
@@ -3,11 +3,11 @@
void ffDetectOSImpl(FFOSResult* os)
{
ffStrbufInitS(&os->name, "Android");
ffStrbufInitStatic(&os->name, "Android");
ffStrbufInitS(&os->prettyName, "Android");
ffStrbufInitStatic(&os->prettyName, "Android");
ffStrbufInitS(&os->id, "android");
ffStrbufInitStatic(&os->id, "android");
ffStrbufInit(&os->version);
ffSettingsGetAndroidProperty("ro.build.version.release", &os->version);
src/detection/terminalshell/terminalshell_linux.c
+8 -8
View File
@@ -363,11 +363,11 @@ const FFTerminalShellResult* ffDetectTerminalShell()
ffStrbufSet(&result.userShellVersion, &result.shellVersion);
if(ffStrbufEqualS(&result.shellProcessName, "pwsh"))
ffStrbufInitS(&result.shellPrettyName, "PowerShell");
ffStrbufInitStatic(&result.shellPrettyName, "PowerShell");
else if(ffStrbufEqualS(&result.shellProcessName, "nu"))
ffStrbufInitS(&result.shellPrettyName, "nushell");
ffStrbufInitStatic(&result.shellPrettyName, "nushell");
else if(ffStrbufIgnCaseEqualS(&result.shellProcessName, "python") && getenv("XONSH_VERSION"))
ffStrbufInitS(&result.shellPrettyName, "xonsh");
ffStrbufInitStatic(&result.shellPrettyName, "xonsh");
else
{
// https://github.com/fastfetch-cli/fastfetch/discussions/280#discussioncomment-3831734
@@ -376,21 +376,21 @@ const FFTerminalShellResult* ffDetectTerminalShell()
if(ffStrbufEqualS(&result.terminalProcessName, "wezterm-gui"))
ffStrbufInitS(&result.terminalPrettyName, "WezTerm");
ffStrbufInitStatic(&result.terminalPrettyName, "WezTerm");
#if defined(__linux__) || defined(__FreeBSD__)
else if(ffStrbufStartsWithS(&result.terminalProcessName, "gnome-terminal-"))
ffStrbufInitS(&result.terminalPrettyName, "gnome-terminal");
ffStrbufInitStatic(&result.terminalPrettyName, "gnome-terminal");
#elif defined(__APPLE__)
else if(ffStrbufEqualS(&result.terminalProcessName, "iTerm.app") || ffStrbufStartsWithS(&result.terminalProcessName, "iTermServer-"))
ffStrbufInitS(&result.terminalPrettyName, "iTerm");
ffStrbufInitStatic(&result.terminalPrettyName, "iTerm");
else if(ffStrbufEqualS(&result.terminalProcessName, "Apple_Terminal"))
ffStrbufInitS(&result.terminalPrettyName, "Apple Terminal");
ffStrbufInitStatic(&result.terminalPrettyName, "Apple Terminal");
else if(ffStrbufEqualS(&result.terminalProcessName, "WarpTerminal"))
ffStrbufInitS(&result.terminalPrettyName, "Warp");
ffStrbufInitStatic(&result.terminalPrettyName, "Warp");
#endif
src/detection/terminalshell/terminalshell_windows.c
+5 -5
View File
@@ -334,18 +334,18 @@ static uint32_t getTerminalInfo(FFTerminalShellResult* result, uint32_t pid)
result->terminalPid = pid;
if(ffStrbufIgnCaseEqualS(&result->terminalPrettyName, "WindowsTerminal"))
ffStrbufSetS(&result->terminalPrettyName, ffStrbufContainIgnCaseS(&result->terminalExe, ".WindowsTerminalPreview_")
ffStrbufSetStatic(&result->terminalPrettyName, ffStrbufContainIgnCaseS(&result->terminalExe, ".WindowsTerminalPreview_")
? "Windows Terminal Preview"
: "Windows Terminal"
);
else if(ffStrbufIgnCaseEqualS(&result->terminalPrettyName, "conhost"))
ffStrbufSetS(&result->terminalPrettyName, "Console Window Host");
ffStrbufSetStatic(&result->terminalPrettyName, "Console Window Host");
else if(ffStrbufIgnCaseEqualS(&result->terminalPrettyName, "Code"))
ffStrbufSetS(&result->terminalPrettyName, "Visual Studio Code");
ffStrbufSetStatic(&result->terminalPrettyName, "Visual Studio Code");
else if(ffStrbufIgnCaseEqualS(&result->terminalPrettyName, "explorer"))
ffStrbufSetS(&result->terminalPrettyName, "Windows Explorer");
ffStrbufSetStatic(&result->terminalPrettyName, "Windows Explorer");
else if(ffStrbufEqualS(&result->terminalPrettyName, "wezterm-gui"))
ffStrbufInitS(&result->terminalPrettyName, "WezTerm");
ffStrbufSetStatic(&result->terminalPrettyName, "WezTerm");
return ppid;
}
src/logo/option.c
+1 -1
View File
@@ -18,7 +18,7 @@ void ffInitLogoOptions(FFLogoOptions* options)
options->preserveAspectRadio = false;
options->chafaFgOnly = false;
ffStrbufInitS(&options->chafaSymbols, "block+border+space-wide-inverted"); // Chafa default
ffStrbufInitStatic(&options->chafaSymbols, "block+border+space-wide-inverted"); // Chafa default
options->chafaCanvasMode = UINT32_MAX;
options->chafaColorSpace = UINT32_MAX;
options->chafaDitherMode = UINT32_MAX;
src/modules/weather/weather.c
+1 -1
View File
@@ -59,7 +59,7 @@ void ffInitWeatherOptions(FFWeatherOptions* options)
ffOptionInitModuleArg(&options->moduleArgs);
ffStrbufInit(&options->location);
ffStrbufInitS(&options->outputFormat, "%t+-+%C+(%l)");
ffStrbufInitStatic(&options->outputFormat, "%t+-+%C+(%l)");
options->timeout = 0;
}