diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d8835339..15907a3a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This release introduces a new configuration file format: JSON config Changes: * Drop the dependency of cJSON. We now use [yyjson](https://ibireme.github.io/yyjson/doc/doxygen/html/index.html) to parse JSON documents. * Remove `--shell-version` and `--terminal-version`. They are always enabled +* Remove `--*-error-format` Features: * Support KDE / LXQT / MATE / Cinnamon wallpaper detection (Wallpaper, Linux) diff --git a/src/common/jsonconfig.c b/src/common/jsonconfig.c index 1b1aeffcc..9defa2572 100644 --- a/src/common/jsonconfig.c +++ b/src/common/jsonconfig.c @@ -21,11 +21,6 @@ bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs* ffStrbufSetNS(&moduleArgs->outputFormat, (uint32_t) yyjson_get_len(val), yyjson_get_str(val)); return true; } - else if(strcasecmp(key, "error") == 0) - { - ffStrbufSetNS(&moduleArgs->errorFormat, (uint32_t) yyjson_get_len(val), yyjson_get_str(val)); - return true; - } return false; } diff --git a/src/common/option.c b/src/common/option.c index f9bdbcff6..cc58fc5de 100644 --- a/src/common/option.c +++ b/src/common/option.c @@ -38,11 +38,6 @@ bool ffOptionParseModuleArgs(const char* argumentKey, const char* subKey, const ffOptionParseString(argumentKey, value, &result->outputFormat); return true; } - else if(strcasecmp(subKey, "error") == 0) - { - ffOptionParseString(argumentKey, value, &result->errorFormat); - return true; - } return false; } @@ -138,12 +133,10 @@ void ffOptionInitModuleArg(FFModuleArgs* args) { ffStrbufInit(&args->key); ffStrbufInit(&args->outputFormat); - ffStrbufInit(&args->errorFormat); } void ffOptionDestroyModuleArg(FFModuleArgs* args) { ffStrbufDestroy(&args->key); ffStrbufDestroy(&args->outputFormat); - ffStrbufDestroy(&args->errorFormat); } diff --git a/src/common/option.h b/src/common/option.h index e0ca7feca..992417430 100644 --- a/src/common/option.h +++ b/src/common/option.h @@ -6,7 +6,6 @@ typedef struct FFModuleArgs { FFstrbuf key; FFstrbuf outputFormat; - FFstrbuf errorFormat; } FFModuleArgs; typedef struct FFKeyValuePair diff --git a/src/common/printing.c b/src/common/printing.c index 7ea0ecb03..896ca7a66 100644 --- a/src/common/printing.c +++ b/src/common/printing.c @@ -60,40 +60,29 @@ void ffPrintFormat(FFinstance* instance, const char* moduleName, uint8_t moduleI ffPrintFormatString(instance, moduleName, moduleIndex, &moduleArgs->key, &moduleArgs->outputFormat, numArgs, arguments); } -static void printError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customErrorFormat, const char* message, va_list arguments) +static void printError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const char* message, va_list arguments) { - bool hasCustomErrorFormat = customErrorFormat != NULL && customErrorFormat->length > 0; - if(!hasCustomErrorFormat && !instance->config.showErrors) + if(!instance->config.showErrors) return; - if(hasCustomErrorFormat) - { - FF_STRBUF_AUTO_DESTROY error = ffStrbufCreateVF(message, arguments); - ffPrintFormatString(instance, moduleName, moduleIndex, customKeyFormat, customErrorFormat, 1, (FFformatarg[]) { - {FF_FORMAT_ARG_TYPE_STRBUF, &error} - }); - } - else - { - ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat); + ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat); - if(!instance->config.pipe) - fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stdout); + if(!instance->config.pipe) + fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stdout); - vprintf(message, arguments); + vprintf(message, arguments); - if(!instance->config.pipe) - fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout); + if(!instance->config.pipe) + fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout); - putchar('\n'); - } + putchar('\n'); } -void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customErrorFormat, const char* message, ...) +void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const char* message, ...) { va_list arguments; va_start(arguments, message); - printError(instance, moduleName, moduleIndex, customKeyFormat, customErrorFormat, message, arguments); + printError(instance, moduleName, moduleIndex, customKeyFormat, message, arguments); va_end(arguments); } @@ -101,7 +90,7 @@ void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIn { va_list arguments; va_start(arguments, message); - printError(instance, moduleName, moduleIndex, &moduleArgs->key, &moduleArgs->errorFormat, message, arguments); + printError(instance, moduleName, moduleIndex, &moduleArgs->key, message, arguments); va_end(arguments); } diff --git a/src/common/printing.h b/src/common/printing.h index 9a734634b..ef189d197 100644 --- a/src/common/printing.h +++ b/src/common/printing.h @@ -9,7 +9,7 @@ void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat); void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* format, uint32_t numArgs, const FFformatarg* arguments); void ffPrintFormat(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, uint32_t numArgs, const FFformatarg* arguments); -FF_C_PRINTF(6, 7) void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const FFstrbuf* customErrorFormat, const char* message, ...); +FF_C_PRINTF(5, 6) void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFstrbuf* customKeyFormat, const char* message, ...); FF_C_PRINTF(5, 6) void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, const char* message, ...); void ffPrintColor(const FFstrbuf* colorValue); void ffPrintCharTimes(char c, uint32_t times);