LocalIP: honors fractionTrailingZeros

CarterLi · CarterLi · commit 8e0a65126e42 · 2025-09-02T14:13:37.000+08:00
diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c
@@ -37,17 +37,13 @@ static void appendSpeed(FFLocalIpResult* ip, FFstrbuf* strbuf)
 {
     if (ip->speed >= 1000000)
     {
-        if (instance.config.display.fractionNdigits >= 0)
-            ffStrbufAppendF(strbuf, "%.*f Tbps", instance.config.display.fractionNdigits, ip->speed / 1000000.0);
-        else
-            ffStrbufAppendF(strbuf, "%g Tbps", ip->speed / 1000000.0);
+        ffStrbufAppendDouble(strbuf, ip->speed / 1e6, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW);
+        ffStrbufAppendS(strbuf, " Tbps");
     }
     else if (ip->speed >= 1000)
     {
-        if (instance.config.display.fractionNdigits >= 0)
-            ffStrbufAppendF(strbuf, "%.*f Gbps", instance.config.display.fractionNdigits, ip->speed / 1000.0);
-        else
-            ffStrbufAppendF(strbuf, "%g Gbps", ip->speed / 1000.0);
+        ffStrbufAppendDouble(strbuf, ip->speed / 1e3, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW);
+        ffStrbufAppendS(strbuf, " Gbps");
     }
     else
         ffStrbufAppendF(strbuf, "%u Mbps", (unsigned) ip->speed);

Original file line number	Diff line number	Diff line change
`@@ -37,17 +37,13 @@ static void appendSpeed(FFLocalIpResult* ip, FFstrbuf* strbuf)`
`37`	`37`	`{`
`38`	`38`	`if (ip->speed >= 1000000)`
`39`	`39`	`{`
`40`		`- if (instance.config.display.fractionNdigits >= 0)`
`41`		`- ffStrbufAppendF(strbuf, "%.*f Tbps", instance.config.display.fractionNdigits, ip->speed / 1000000.0);`
`42`		`- else`
`43`		`- ffStrbufAppendF(strbuf, "%g Tbps", ip->speed / 1000000.0);`
	`40`	`+ ffStrbufAppendDouble(strbuf, ip->speed / 1e6, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW);`
	`41`	`+ ffStrbufAppendS(strbuf, " Tbps");`
`44`	`42`	`}`
`45`	`43`	`else if (ip->speed >= 1000)`
`46`	`44`	`{`
`47`		`- if (instance.config.display.fractionNdigits >= 0)`
`48`		`- ffStrbufAppendF(strbuf, "%.*f Gbps", instance.config.display.fractionNdigits, ip->speed / 1000.0);`
`49`		`- else`
`50`		`- ffStrbufAppendF(strbuf, "%g Gbps", ip->speed / 1000.0);`
	`45`	`+ ffStrbufAppendDouble(strbuf, ip->speed / 1e3, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros == FF_FRACTION_TRAILING_ZEROS_TYPE_SHOW);`
	`46`	`+ ffStrbufAppendS(strbuf, " Gbps");`
`51`	`47`	`}`
`52`	`48`	`else`
`53`	`49`	`ffStrbufAppendF(strbuf, "%u Mbps", (unsigned) ip->speed);`