From 841be619bae218a3881ff9a796d5b8ec4784af98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 25 Jul 2023 16:09:09 +0800 Subject: [PATCH] Global: use ffStrbufInitStatic --- src/common/init.c | 2 +- .../displayserver/displayserver_apple.c | 7 +++---- .../displayserver/displayserver_windows.c | 14 +++++++------- src/detection/os/os_android.c | 6 +++--- .../terminalshell/terminalshell_linux.c | 16 ++++++++-------- .../terminalshell/terminalshell_windows.c | 10 +++++----- src/logo/option.c | 2 +- src/modules/weather/weather.c | 2 +- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/common/init.c b/src/common/init.c index e71509292..ba8c173a2 100644 --- a/src/common/init.c +++ b/src/common/init.c @@ -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__) diff --git a/src/detection/displayserver/displayserver_apple.c b/src/detection/displayserver/displayserver_apple.c index d004647d4..60feb6efe 100644 --- a/src/detection/displayserver/displayserver_apple.c +++ b/src/detection/displayserver/displayserver_apple.c @@ -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); diff --git a/src/detection/displayserver/displayserver_windows.c b/src/detection/displayserver/displayserver_windows.c index a37c506b1..b4945436b 100644 --- a/src/detection/displayserver/displayserver_windows.c +++ b/src/detection/displayserver/displayserver_windows.c @@ -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"); } diff --git a/src/detection/os/os_android.c b/src/detection/os/os_android.c index 18b491283..1877aadfb 100644 --- a/src/detection/os/os_android.c +++ b/src/detection/os/os_android.c @@ -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); diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c index eede327c5..88d6519a4 100644 --- a/src/detection/terminalshell/terminalshell_linux.c +++ b/src/detection/terminalshell/terminalshell_linux.c @@ -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 diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c index 15c2da12f..aa38e0075 100644 --- a/src/detection/terminalshell/terminalshell_windows.c +++ b/src/detection/terminalshell/terminalshell_windows.c @@ -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; } diff --git a/src/logo/option.c b/src/logo/option.c index a3b59b806..96e9caed0 100644 --- a/src/logo/option.c +++ b/src/logo/option.c @@ -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; diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index cbf5cb524..b80875108 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -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; }