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

Timestamp:

Mar 28, 2017 12:48:56 PM (8 years ago)

Author:

vboxsync

Message:

strformatrt.cpp: Reduced the ring-0 address code a little.

File:

• trunk/src/VBox/Runtime/common/string/strformatrt.cpp (modified) (1 diff)

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

@@ -476 +476 @@
                  * For now don't show the address.
                  */
-                cch = 0;
                 if (fFlags & RTSTR_F_OBFUSCATE_PTR)
                 {
+# if R0_ARCH_BITS == 64
+                    static const char s_szObfuscated[] = "0xXXXXXXXX";
+# else
+                    static const char s_szObfuscated[] = "0xXXXXXXXXXXXXXXXX";
+# endif
                     if (fFlags & RTSTR_F_SPECIAL)
-                        cch += pfnOutput(pvArgOutput, RT_STR_TUPLE("0x"));
-
-# if R0_ARCH_BITS == 32
-                    cch += pfnOutput(pvArgOutput, RT_STR_TUPLE("XXXXXXXX"));
-# elif R0_ARCH_BITS == 64
-                    cch += pfnOutput(pvArgOutput, RT_STR_TUPLE("XXXXXXXXXXXXXXXX"));
-# else
-#  error implement me!
-# endif
-                    return cch;
+                        return pfnOutput(pvArgOutput, s_szObfuscated, sizeof(s_szObfuscated) - 1);
+                    return pfnOutput(pvArgOutput, &s_szObfuscated[2], sizeof(s_szObfuscated) - 1 - 2);
                 }
 #endif