diff --git a/doc/json_schema.json b/doc/json_schema.json index 4f658422e..6152dd60d 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -1356,11 +1356,11 @@ "description": "Use the behavior defined internally" }, { - "const": "show", + "const": "always", "description": "Always keep trailing zeros" }, { - "const": "hide", + "const": "never", "description": "Never keep trailing zeros" } ], diff --git a/src/common/format.c b/src/common/format.c index 5cc27ed77..82baaa180 100644 --- a/src/common/format.c +++ b/src/common/format.c @@ -32,10 +32,10 @@ void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg) ffStrbufAppend(buffer, (const FFstrbuf*)formatarg->value); break; case FF_FORMAT_ARG_TYPE_FLOAT: - ffStrbufAppendDouble(buffer, *(float*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE); + ffStrbufAppendDouble(buffer, *(float*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER); break; case FF_FORMAT_ARG_TYPE_DOUBLE: - ffStrbufAppendDouble(buffer, *(double*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE); + ffStrbufAppendDouble(buffer, *(double*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER); break; case FF_FORMAT_ARG_TYPE_BOOL: ffStrbufAppendS(buffer, *(bool*)formatarg->value ? "true" : "false"); diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 562447ed9..7d8e80d96 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -114,7 +114,7 @@ bool ffPrintDisplay(FFDisplayOptions* options) result->scaledHeight > 0 && result->scaledHeight != result->height) { ffStrbufAppendS(&buffer, " @ "); - ffStrbufAppendDouble(&buffer, scaleFactor, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW); + ffStrbufAppendDouble(&buffer, scaleFactor, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS); ffStrbufAppendC(&buffer, 'x'); } diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index 70f0370fe..6b7266940 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -37,12 +37,12 @@ static void appendSpeed(FFLocalIpResult* ip, FFstrbuf* strbuf) { if (ip->speed >= 1000000) { - ffStrbufAppendDouble(strbuf, ip->speed / 1e6, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW); + ffStrbufAppendDouble(strbuf, ip->speed / 1e6, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS); ffStrbufAppendS(strbuf, " Tbps"); } else if (ip->speed >= 1000) { - ffStrbufAppendDouble(strbuf, ip->speed / 1e3, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW); + ffStrbufAppendDouble(strbuf, ip->speed / 1e3, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS); ffStrbufAppendS(strbuf, " Gbps"); } else diff --git a/src/options/display.c b/src/options/display.c index 3d90210d0..ab9d4c372 100644 --- a/src/options/display.c +++ b/src/options/display.c @@ -420,8 +420,8 @@ const char* ffOptionsParseDisplayJsonConfig(FFOptionsDisplay* options, yyjson_va int value; const char* error = ffJsonConfigParseEnum(trailingZeros, &value, (FFKeyValuePair[]) { { "default", FF_FRACTION_TRAILING_ZEROS_TYPE_DEFAULT }, - { "show", FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW }, - { "hide", FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE }, + { "always", FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS }, + { "never", FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER }, {}, }); if (error) return error; @@ -755,8 +755,8 @@ bool ffOptionsParseDisplayCommandLine(FFOptionsDisplay* options, const char* key { options->fractionTrailingZeros = (FFFractionTrailingZerosType) ffOptionParseEnum(key, value, (FFKeyValuePair[]) { { "default", FF_FRACTION_TRAILING_ZEROS_TYPE_DEFAULT }, - { "show", FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW }, - { "hide", FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE }, + { "always", FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS }, + { "never", FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER }, {}, }); } diff --git a/src/options/display.h b/src/options/display.h index c7bdef5b5..4c29845e1 100644 --- a/src/options/display.h +++ b/src/options/display.h @@ -28,8 +28,8 @@ typedef enum __attribute__((__packed__)) FFSpaceBeforeUnitType typedef enum __attribute__((__packed__)) FFFractionTrailingZerosType { FF_FRACTION_TRAILING_ZEROS_TYPE_DEFAULT, - FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW, - FF_FRACTION_TRAILING_ZEROS_TYPE_HIDE, + FF_FRACTION_TRAILING_ZEROS_TYPE_ALWAYS, + FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER, } FFFractionTrailingZerosType; typedef struct FFOptionsDisplay