From c116a5abdf378670d04312a27ad34fd4fbe15fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 22 Jan 2026 09:06:23 +0800 Subject: [PATCH] Chore: uses elvis operators where applicatable --- src/common/impl/commandoption.c | 2 +- src/detection/gpu/gpu_linux.c | 2 +- src/logo/logo.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/impl/commandoption.c b/src/common/impl/commandoption.c index 9b89a811a..7bfc48999 100644 --- a/src/common/impl/commandoption.c +++ b/src/common/impl/commandoption.c @@ -61,7 +61,7 @@ bool ffParseModuleOptions(const char* key, const char* value) } fprintf(stderr, "Error: Unsupported module option: %s\n", key); fputs(" Support of module options has been removed. Please add the flag to the JSON config instead.\n", stderr); - fprintf(stderr, " Example (demonstration only): `{ \"modules\": [ { \"type\": \"%s\", \"%s\": %s%s%s } ] }`\n", moduleName.chars, jsonKey.chars, value ? "\"" : "", value ? value : "true", value ? "\"" : ""); + fprintf(stderr, " Example (demonstration only): `{ \"modules\": [ { \"type\": \"%s\", \"%s\": %s%s%s } ] }`\n", moduleName.chars, jsonKey.chars, value ? "\"" : "", value ?: "true", value ? "\"" : ""); fputs(" See for more information.\n", stderr); exit(477); } diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c index 26a6529a7..68dcc52a4 100644 --- a/src/detection/gpu/gpu_linux.c +++ b/src/detection/gpu/gpu_linux.c @@ -560,7 +560,7 @@ static const char* detectOf(FFlist* gpus, FFstrbuf* buffer, FFstrbuf* drmDir, co if (!gpu->name.length) { - ffStrbufSetS(&gpu->name, name ? name : compatible); + ffStrbufSetS(&gpu->name, name ?: compatible); ffStrbufTrimRightSpace(&gpu->name); } if (!gpu->vendor.length && name) diff --git a/src/logo/logo.c b/src/logo/logo.c index 1bd6cb8e9..d4c682a1f 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -307,10 +307,10 @@ void ffLogoPrintChars(const char* data, bool doColorReplacement) static void logoApplyColors(const FFlogo* logo, bool replacement) { if(instance.config.display.colorTitle.length == 0) - ffStrbufAppendS(&instance.config.display.colorTitle, logo->colorTitle ? logo->colorTitle : logo->colors[0]); + ffStrbufAppendS(&instance.config.display.colorTitle, logo->colorTitle ?: logo->colors[0]); if(instance.config.display.colorKeys.length == 0) - ffStrbufAppendS(&instance.config.display.colorKeys, logo->colorKeys ? logo->colorKeys : logo->colors[1]); + ffStrbufAppendS(&instance.config.display.colorKeys, logo->colorKeys ?: logo->colors[1]); if (replacement) {