Global: renames fractionTrailingZeros enum to always/never for consistance

Author: CarterLi

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"
                                 }
                             ],

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");

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');
             }
 

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

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 },
             {},
         });
     }

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