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

Timestamp:

Mar 15, 2022 11:01:14 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/RTStrFormatR80[u2]: A little overhaul to better deal with special values and using the RTSTR_F_SPECIAL flag to show more data for these when applicable. [build fix for darwin kernel mode] bugref:9898

File:

• trunk/src/VBox/Runtime/common/string/strformatnum.cpp (modified) (4 diffs)

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

@@ -299 +299 @@
                      ? rtStrFormatR80CopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("+PseudoNan"))
                      : rtStrFormatR80CopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("-PseudoNan"));
-            pszTmp = (char *)memcpy(pszTmp, RT_STR_TUPLE("PseudoNan[")) + 10;
+            pszTmp = (char *)memcpy(pszTmp, "PseudoNan[", 10) + 10;
         }
         else if (!(uFraction & RT_BIT_64(62)))
@@ -309 +309 @@
             if (!(fFlags & RTSTR_F_SPECIAL))
                 return rtStrFormatR80CopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("Nan"));
-            pszTmp = (char *)memcpy(pszTmp, RT_STR_TUPLE("Nan[")) + 4;
+            pszTmp = (char *)memcpy(pszTmp, "Nan[", 4) + 4;
         }
         else
@@ -319 +319 @@
             if (!(fFlags & RTSTR_F_SPECIAL))
                 return rtStrFormatR80CopyOutStr(pszBuf, cbBuf, RT_STR_TUPLE("QNan"));
-            pszTmp = (char *)memcpy(pszTmp, RT_STR_TUPLE("QNan[")) + 4;
+            pszTmp = (char *)memcpy(pszTmp, "QNan[", 5) + 5;
         }
         pszTmp += RTStrFormatNumber(pszTmp, uFraction, 16, 2 + 16, 0,
@@ -341 +341 @@
     {
         if (fInteger)
-            pszTmp = (char *)memcpy(pszTmp, RT_STR_TUPLE("[PDn]")) + 5;
-        else
-            pszTmp = (char *)memcpy(pszTmp, RT_STR_TUPLE("[Den]")) + 5;
+            pszTmp = (char *)memcpy(pszTmp, "[PDn]", 5) + 5;
+        else
+            pszTmp = (char *)memcpy(pszTmp, "[Den]", 5) + 5;
     }
     return rtStrFormatR80CopyOutStr(pszBuf, cbBuf, szTmp, pszTmp - &szTmp[0]);