Changeset 66284 in vbox

Timestamp:

Mar 28, 2017 9:04:15 AM (8 years ago)

Author:

vboxsync

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

114209

Message:

Runtime: introduced 'RKv' format specifier

Location:

trunk

Files:

• include/iprt/string.h (modified) (1 diff)
• src/VBox/Runtime/common/string/strformatrt.cpp (modified) (3 diffs)

trunk/include/iprt/string.h

@@ -1435 +1435 @@
 #define RTSTR_F_PRECISION       0x0100
 #define RTSTR_F_THOUSAND_SEP    0x0200
+#define RTSTR_F_OBFUSCATE_PTR   0x0400
 
 #define RTSTR_F_BIT_MASK        0xf800

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

@@ -252 +252 @@
             case 'X':
             case 'U':
+            case 'K':
             {
                 /*
@@ -305 +306 @@
                     { STRMEM("I64"),     sizeof(int64_t),        10, RTSF_INT,   RTSTR_F_VALSIGNED },
                     { STRMEM("I8"),      sizeof(int8_t),         10, RTSF_INT,   RTSTR_F_VALSIGNED },
+                    { STRMEM("Kv"),      sizeof(RTHCPTR),        16, RTSF_INT,   RTSTR_F_OBFUSCATE_PTR },
                     { STRMEM("Rv"),      sizeof(RTRCPTR),        16, RTSF_INTW,  0 },
                     { STRMEM("Tbool"),   sizeof(bool),           10, RTSF_BOOL,  0 },
@@ -471 +473 @@
 
                 /*
+                 * For now don't show the address.
+                 */
+                cch = 0;
+                if (fFlags & RTSTR_F_OBFUSCATE_PTR)
+                {
+                    if (fFlags & RTSTR_F_SPECIAL)
+                        cch += pfnOutput(pvArgOutput, RT_STR_TUPLE("0x"));
+
+#ifdef RT_ARCH_X86
+                    cch += pfnOutput(pvArgOutput, RT_STR_TUPLE("XXXXXXXX"));
+#else
+                    cch += pfnOutput(pvArgOutput, RT_STR_TUPLE("XXXXXXXXXXXXXXXX"));
+#endif
+                    return cch;
+                }
+
+                /*
                  * Format the output.
                  */