From c1f6a2f75522b8692bfd6e8aed3bd24e98e1e1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 22 Apr 2025 14:30:39 +0800 Subject: [PATCH] Refactor: inline printError into ffPrintError and remove unused static helper --- src/common/printing.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/common/printing.c b/src/common/printing.c index 38369d373..857b06c7a 100644 --- a/src/common/printing.c +++ b/src/common/printing.c @@ -100,7 +100,7 @@ void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleAr ffStrbufPutTo(&buffer, stdout); } -static void printError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, va_list arguments) +void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...) { if(!instance.config.display.showErrors) return; @@ -110,7 +110,10 @@ static void printError(const char* moduleName, uint8_t moduleIndex, const FFModu if(!instance.config.display.pipe) fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stdout); + va_list arguments; + va_start(arguments, message); vprintf(message, arguments); + va_end(arguments); if(!instance.config.display.pipe) fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout); @@ -118,14 +121,6 @@ static void printError(const char* moduleName, uint8_t moduleIndex, const FFModu putchar('\n'); } -void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...) -{ - va_list arguments; - va_start(arguments, message); - printError(moduleName, moduleIndex, moduleArgs, printType, message, arguments); - va_end(arguments); -} - void ffPrintColor(const FFstrbuf* colorValue) { //If the color is not set, this would reset in \033[m, which resets everything.