Changeset 80496 in vbox

Timestamp:

Aug 29, 2019 11:58:21 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132989

Message:

IPRT/string.h: Added added two more human readable size formatting variants for skipping the 'i' in 'KiB' and such. Made the human readable size formatting use the space format flag to specify a space between the value and the unit.

Location:

trunk

Files:

• include/iprt/string.h (modified) (2 diffs)
• src/VBox/Runtime/common/string/strformatrt.cpp (modified) (6 diffs)
• src/VBox/Runtime/testcase/tstRTStrFormat.cpp (modified) (1 diff)

trunk/include/iprt/string.h

@@ -1477 +1477 @@
  *                            decimal point by default, can do 0-3 via precision
  *                            field.  No rounding when calculating fraction.
+ *                            The space flag add a space between the value and
+ *                            unit.
+ *      - \%RhcB            - Same a \%Rhcb only the 'i' is skipped in the unit.
  *      - \%Rhci            - SI variant of \%Rhcb, fraction is rounded.
  *      - \%Rhub            - Human readable number formatting, using
@@ -1482 +1485 @@
  *                            integer as input. Does one decimal point by
  *                            default, can do 0-3 via precision field.  No
- *                            rounding when calculating fraction.
+ *                            rounding when calculating fraction.  The space
+ *                            flag add a space between the value and unit.
+ *      - \%RhuB            - Same a \%Rhub only the 'i' is skipped in the unit.
  *      - \%Rhui            - SI variant of \%Rhub, fraction is rounded.
  *

trunk/src/VBox/Runtime/common/string/strformatrt.cpp

@@ -989 +989 @@
 #endif /* IN_RING3 */
 
+                    /*
+                     * Human readable sizes.
+                     */
                     case 'c':
                     case 'u':
@@ -997 +1000 @@
                         uint64_t    uFraction = 0;
                         const char *pszPrefix = NULL;
-                        unsigned    cchFixedPart;
                         char        ch2 = *(*ppszFormat)++;
-                        AssertMsgReturn(ch2 == 'b' || ch2 == 'i', ("invalid type '%.10s'!\n", pszFormatOrg), 0);
+                        AssertMsgReturn(ch2 == 'b' || ch2 == 'B' || ch2 == 'i', ("invalid type '%.10s'!\n", pszFormatOrg), 0);
                         uValue = va_arg(*pArgs, uint64_t);
 
                         if (!(fFlags & RTSTR_F_PRECISION))
-                            cchPrecision = 1;
+                            cchPrecision = 1; /** @todo default to flexible decimal point. */
                         else if (cchPrecision > 3)
                             cchPrecision = 3;
@@ -1009 +1011 @@
                             cchPrecision = 0;
 
-                        cchFixedPart = cchPrecision + (cchPrecision != 0) + (ch == 'c');
-
-                        if (ch2 == 'b')
+                        if (ch2 == 'b' || ch2 == 'B')
                         {
                             static const struct
@@ -1040 +1040 @@
                                     uValue  >>= s_aUnits[i].cShift;
                                     pszPrefix = s_aUnits[i].pszPrefix;
-                                    cchFixedPart += 2;
                                     break;
                                 }
@@ -1075 +1074 @@
                                     }
                                     pszPrefix = s_aUnits[i].pszPrefix;
-                                    cchFixedPart += 1;
                                     break;
                                 }
@@ -1089 +1087 @@
                                                          RTSTR_F_ZEROPAD | RTSTR_F_WIDTH);
                             }
+                            if (fFlags & RTSTR_F_BLANK)
+                                szBuf[cchBuf++] = ' ';
                             szBuf[cchBuf++] = *pszPrefix++;
-                            if (*pszPrefix)
+                            if (*pszPrefix && ch2 != 'B')
                                 szBuf[cchBuf++] = *pszPrefix;
                         }
+                        else if (fFlags & RTSTR_F_BLANK)
+                            szBuf[cchBuf++] = ' ';
                         if (ch == 'c')
                             szBuf[cchBuf++] = 'B';

trunk/src/VBox/Runtime/testcase/tstRTStrFormat.cpp

@@ -775 +775 @@
     cch = RTStrPrintf(pszBuf, BUF_SIZE, "%10Rhcb%u", UINT64_C(6678345), 42);
     CHECKSTR("    6.3MiB42");
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%10Rhcb%u", UINT64_C(6710886), 42);
+    CHECKSTR("    6.3MiB42");
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%10Rhcb%u", UINT64_C(6710887), 42);
+    CHECKSTR("    6.4MiB42");
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "% 10Rhcb%u", UINT64_C(6710887), 42);
+    CHECKSTR("   6.4 MiB42");
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "% 10RhcB%u", UINT64_C(6710887), 42);
+    CHECKSTR("    6.4 MB42");
 
     cch = RTStrPrintf(pszBuf, BUF_SIZE, "%10Rhub%u", UINT64_C(6678345), 42);
     CHECKSTR("     6.3Mi42");
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%10RhuB%u", UINT64_C(6678345), 42);
+    CHECKSTR("      6.3M42");
 
     cch = RTStrPrintf(pszBuf, BUF_SIZE, "%10Rhci%u", UINT64_C(6678345), 42);