Changeset 66415 in vbox for trunk/src/VBox/Runtime/common/string/strformatrt.cpp

Timestamp:

Apr 4, 2017 1:17:22 PM (8 years ago)

Author:

vboxsync

Message:

IPRT: split %RKv formatting into separate function.

File:

• trunk/src/VBox/Runtime/common/string/strformatrt.cpp (modified) (2 diffs)

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

@@ -365 +365 @@
                     int32_t             i32;
                     int64_t             i64;
+                    RTR0INTPTR          uR0Ptr;
                     RTFAR16             fp16;
                     RTFAR32             fp32;
@@ -478 +479 @@
                 if (fFlags & RTSTR_F_OBFUSCATE_PTR)
                 {
-# if R0_ARCH_BITS == 64
-                    static const char s_szObfuscated[] = "0xXXXXXXXXXXXXXXXX";
-# else
-                    static const char s_szObfuscated[] = "0xXXXXXXXX";
-# endif
-                    if (fFlags & RTSTR_F_SPECIAL)
-                        return pfnOutput(pvArgOutput, s_szObfuscated, sizeof(s_szObfuscated) - 1);
-                    return pfnOutput(pvArgOutput, &s_szObfuscated[2], sizeof(s_szObfuscated) - 1 - 2);
+                    cch = rtStrFormatKernelAddress(szBuf, sizeof(szBuf), u.uR0Ptr, cchWidth, cchPrecision, fFlags);
+                    return pfnOutput(pvArgOutput, szBuf, cch);
                 }
 #endif