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

Timestamp:

Aug 3, 2016 8:46:35 AM (8 years ago)

Author:

vboxsync

Message:

Runtime: deal with nested template classes when showing the 'short' function/method name in strformatrt.c, it produced garbled/truncated method names before

File:

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

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

@@ -710 +710 @@
                         const char *pszStart;
                         const char *psz = pszStart = va_arg(*pArgs, const char *);
+                        int cAngle = 0;
+
                         if (!VALID_PTR(psz))
                             return pfnOutput(pvArgOutput, RT_STR_TUPLE("<null>"));
@@ -720 +722 @@
                                 while ((ch = *psz) != '\0' && (RT_C_IS_BLANK(ch) || ch == '('))
                                     psz++;
-                                if (ch)
+                                if (ch && cAngle == 0)
                                     pszStart = psz;
                             }
                             else if (ch == '(')
                                 break;
+                            else if (ch == '<')
+                            {
+                                cAngle++;
+                                psz++;
+                            }
+                            else if (ch == '>')
+                            {
+                                cAngle--;
+                                psz++;
+                            }
                             else
                                 psz++;