Changeset 74157 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Sep 9, 2018 1:17:21 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/strformat: Fixed bug formatting INT64_MAX. Cleaned up the integer formatting code to get rid of anachronisms (VAC308).

File:

• trunk/src/VBox/Runtime/common/string/strformat.cpp (modified) (17 diffs)

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

@@ -27 +27 @@
 
 /*********************************************************************************************************************************
-*   Defined Constants                                                                                                            *
-*********************************************************************************************************************************/
-#define ISDIGIT(c) ((c) >= '0' && (c) <= '9')
-/*#define MAX(a, b)  ((a) >= (b) ? (a) : (b))
-#define MIN(a, b)  ((a) < (b) ? (a) : (b)) */
-
-
-/*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
@@ -47 +39 @@
 # include <iprt/uni.h>
 #endif
+#include <iprt/ctype.h>
 #include <iprt/string.h>
 #include <iprt/stdarg.h>
 #include "internal/string.h"
 
-/* Wrappers for converting to iprt facilities. */
-#define SSToDS(ptr)     ptr
-#define kASSERT         Assert
-#define KENDIAN_LITTLE  1
-#define KENDIAN         KENDIAN_LITTLE
-#define KSIZE           size_t
-typedef struct
-{
-    uint32_t    ulLo;
-    uint32_t    ulHi;
-} KSIZE64;
-
-
-/*********************************************************************************************************************************
-*   Internal Functions                                                                                                           *
-*********************************************************************************************************************************/
-static unsigned _strnlen(const char *psz, unsigned cchMax);
-static unsigned _strnlenUtf16(PCRTUTF16 pwsz, unsigned cchMax);
-static int rtStrFormatNumber(char *psz, KSIZE64 ullValue, unsigned int uiBase, signed int cchWidth, signed int cchPrecision, unsigned int fFlags);
 
 
@@ -140 +114 @@
  * Formats an integer number according to the parameters.
  *
- * @returns   Length of the formatted number.
- * @param     psz            Pointer to output string buffer of sufficient size.
- * @param     u64Value       Value to format.
+ * @returns   Length of the number.
+ * @param     psz            Pointer to output string.
+ * @param     u64Value       Value.
  * @param     uiBase         Number representation base.
- * @param     cchWidth       Width.
+ * @param     cchWidth       Width
  * @param     cchPrecision   Precision.
  * @param     fFlags         Flags (NTFS_*).
@@ -151 +125 @@
                               unsigned int fFlags)
 {
-    return rtStrFormatNumber(psz, *(KSIZE64 *)(void *)&u64Value, uiBase, cchWidth, cchPrecision, fFlags);
-}
-RT_EXPORT_SYMBOL(RTStrFormatNumber);
-
-
-
-/**
- * Formats an integer number according to the parameters.
- *
- * @returns   Length of the number.
- * @param     psz            Pointer to output string.
- * @param     ullValue       Value. Using the high part is optional.
- * @param     uiBase         Number representation base.
- * @param     cchWidth       Width
- * @param     cchPrecision   Precision.
- * @param     fFlags         Flags (NTFS_*).
- */
-static int rtStrFormatNumber(char *psz, KSIZE64 ullValue, unsigned int uiBase, signed int cchWidth, signed int cchPrecision,
-                             unsigned int fFlags)
-{
     const char     *pachDigits = "0123456789abcdef";
     char           *pszStart = psz;
     int             cchMax;
     int             cchValue;
-    unsigned long   ul;
     int             i;
     int             j;
+    char            chSign;
 
     /*
@@ -193 +147 @@
 
     /*
-     * Determine value length
+     * Determine value length and sign.  Converts the u64Value to unsigned.
      */
     cchValue = 0;
-    if (ullValue.ulHi || (fFlags & RTSTR_F_64BIT))
-    {
-        uint64_t    u64 = *(uint64_t *)(void *)&ullValue;
-        if ((fFlags & RTSTR_F_VALSIGNED) && (ullValue.ulHi & 0x80000000))
-            u64 = -(int64_t)u64;
+    chSign = '\0';
+    if ((fFlags & RTSTR_F_64BIT) || (u64Value & UINT64_C(0xffffffff00000000)))
+    {
+        uint64_t u64;
+        if (!(fFlags & RTSTR_F_VALSIGNED) || !(u64Value & RT_BIT_64(63)))
+            u64 = u64Value;
+        else if (u64Value != RT_BIT_64(63))
+        {
+            chSign = '-';
+            u64 = u64Value = -(int64_t)u64Value;
+        }
+        else
+        {
+            chSign = '-';
+            u64 = u64Value = RT_BIT_64(63);
+        }
         do
         {
@@ -209 +174 @@
     else
     {
-        ul = (fFlags & RTSTR_F_VALSIGNED) && (ullValue.ulLo & 0x80000000) ? -(int32_t)ullValue.ulLo : ullValue.ulLo;
+        uint32_t u32 = (uint32_t)u64Value;
+        if (!(fFlags & RTSTR_F_VALSIGNED) || !(u32 & UINT32_C(0x80000000)))
+        { /* likley */ }
+        else if (u32 != UINT32_C(0x80000000))
+        {
+            chSign = '-';
+            u64Value = u32 = -(int32_t)u32;
+        }
+        else
+        {
+            chSign = '-';
+            u64Value = u32 = UINT32_C(0x80000000);
+        }
         do
         {
             cchValue++;
-            ul /= uiBase;
-        } while (ul);
+            u32 /= uiBase;
+        } while (u32);
     }
     if (fFlags & RTSTR_F_THOUSAND_SEP)
@@ -230 +207 @@
     if (fFlags & RTSTR_F_VALSIGNED)
     {
-        if ((ullValue.ulHi || (fFlags & RTSTR_F_64BIT) ? ullValue.ulHi : ullValue.ulLo) & 0x80000000)
-        {
-            ullValue.ulLo = -(int32_t)ullValue.ulLo;
-            if (ullValue.ulHi)
-                ullValue.ulHi = ~ullValue.ulHi;
-            psz[i++] = '-';
-        }
+        if (chSign != '\0')
+            psz[i++] = chSign;
         else if (fFlags & (RTSTR_F_PLUS | RTSTR_F_BLANK))
             psz[i++] = (char)(fFlags & RTSTR_F_PLUS ? '+' : ' ');
@@ -289 +261 @@
     psz += cchValue;
     i = -1;
-    if (ullValue.ulHi || (fFlags & RTSTR_F_64BIT))
-    {
-        uint64_t    u64 = *(uint64_t *)(void *)&ullValue;
+    if ((fFlags & RTSTR_F_64BIT) || (u64Value & UINT64_C(0xffffffff00000000)))
+    {
+        uint64_t u64 = u64Value;
         if (fFlags & RTSTR_F_THOUSAND_SEP)
         {
@@ -313 +285 @@
     else
     {
-        ul = (fFlags & RTSTR_F_VALSIGNED) && (ullValue.ulLo & 0x80000000) ? -(int32_t)ullValue.ulLo : ullValue.ulLo;
+        uint32_t u32 = (uint32_t)u64Value;
         if (fFlags & RTSTR_F_THOUSAND_SEP)
         {
@@ -320 +292 @@
                 if ((-i - 1) % 4 == 3)
                     psz[i--] = ' ';
-                psz[i--] = pachDigits[ul % uiBase];
-                ul /= uiBase;
-            } while (ul);
+                psz[i--] = pachDigits[u32 % uiBase];
+                u32 /= uiBase;
+            } while (u32);
         }
         else
@@ -328 +300 @@
             do
             {
-                psz[i--] = pachDigits[ul % uiBase];
-                ul /= uiBase;
-            } while (ul);
+                psz[i--] = pachDigits[u32 % uiBase];
+                u32 /= uiBase;
+            } while (u32);
         }
     }
@@ -344 +316 @@
     return (unsigned)(psz - pszStart);
 }
+RT_EXPORT_SYMBOL(RTStrFormatNumber);
 
 
@@ -366 +339 @@
     char        szTmp[64]; /* Worker functions assumes 64 byte buffer! Ugly but faster. */
     va_list     args;
-    KSIZE       cch = 0;
+    size_t      cch = 0;
     const char *pszStartOutput = pszFormat;
 
@@ -408 +381 @@
 
                 /* width */
-                if (ISDIGIT(*pszFormat))
+                if (RT_C_IS_DIGIT(*pszFormat))
                 {
-                    for (cchWidth = 0; ISDIGIT(*pszFormat); pszFormat++)
+                    for (cchWidth = 0; RT_C_IS_DIGIT(*pszFormat); pszFormat++)
                     {
                         cchWidth *= 10;
@@ -433 +406 @@
                 {
                     pszFormat++;
-                    if (ISDIGIT(*pszFormat))
-                    {
-                        for (cchPrecision = 0; ISDIGIT(*pszFormat); pszFormat++)
+                    if (RT_C_IS_DIGIT(*pszFormat))
+                    {
+                        for (cchPrecision = 0; RT_C_IS_DIGIT(*pszFormat); pszFormat++)
                         {
                             cchPrecision *= 10;
@@ -527 +500 @@
                         szTmp[0] = (char)va_arg(args, int);
                         szTmp[1] = '\0';                     /* Some output functions wants terminated strings. */
-                        cch += pfnOutput(pvArgOutput, SSToDS(&szTmp[0]), 1);
+                        cch += pfnOutput(pvArgOutput, &szTmp[0], 1);
 
                         while (--cchWidth > 0)
@@ -753 +726 @@
                             }
                         }
-                        cchNum = RTStrFormatNumber((char *)SSToDS(&szTmp), u64Value, uBase, cchWidth, cchPrecision, fFlags);
-                        cch += pfnOutput(pvArgOutput, (char *)SSToDS(&szTmp), cchNum);
+                        cchNum = RTStrFormatNumber((char *)&szTmp, u64Value, uBase, cchWidth, cchPrecision, fFlags);
+                        cch += pfnOutput(pvArgOutput, (char *)&szTmp, cchNum);
                         break;
                     }