Companion patch of valgrind r14664.

git-svn-id: svn://svn.valgrind.org/vex/trunk@2978

diff --git a/VEX/switchback/test_bzip2.c b/VEX/switchback/test_bzip2.c
index 7d0af5a82926173efb83a23f51342d8da97e4278..19fc8223a009ff015da4978347cd6482ce963edd 100644 (file)
--- a/VEX/switchback/test_bzip2.c
+++ b/VEX/switchback/test_bzip2.c
@@ -1222,18 +1222,16 @@ UInt vprintf_wrk ( void(*send)(HChar), const HChar *format, va_list vargs )
         }
 #        if 0
         case 'y': { /* %y - print symbol */
-           Char buf[100];
-           Char *cp = buf;
            Addr a = va_arg(vargs, Addr);
 
-           if (flags & VG_MSG_PAREN)
-              *cp++ = '(';
-           if (VG_(get_fnname_w_offset)(a, cp, sizeof(buf)-4)) {
+            HChar *name;
+           if (VG_(get_fnname_w_offset)(a, &name)) {
+               HChar buf[1 + VG_strlen(name) + 1 + 1];
               if (flags & VG_MSG_PAREN) {
-                 cp += VG_(strlen)(cp);
-                 *cp++ = ')';
-                 *cp = '\0';
-              }
+                  VG_(sprintf)(str, "(%s)", name):
+              } else {
+                  VG_(sprintf)(str, "%s", name):
+               }
               ret += myvprintf_str(send, flags, width, buf, 0);
            }
            break;

diff --git a/VEX/switchback/test_emfloat.c b/VEX/switchback/test_emfloat.c
index 9274e710c366929ea47fecaf7ebf56df3b618bc2..c47ccf8353ad839be86e8e7e57ed15583b016210 100644 (file)
--- a/VEX/switchback/test_emfloat.c
+++ b/VEX/switchback/test_emfloat.c
@@ -353,18 +353,16 @@ UInt vprintf_wrk ( void(*send)(HChar), const HChar *format, va_list vargs )
         }
 #        if 0
         case 'y': { /* %y - print symbol */
-           Char buf[100];
-           Char *cp = buf;
            Addr a = va_arg(vargs, Addr);
 
-           if (flags & VG_MSG_PAREN)
-              *cp++ = '(';
-           if (VG_(get_fnname_w_offset)(a, cp, sizeof(buf)-4)) {
+            HChar *name;
+           if (VG_(get_fnname_w_offset)(a, &name)) {
+               HChar buf[1 + VG_strlen(name) + 1 + 1];
               if (flags & VG_MSG_PAREN) {
-                 cp += VG_(strlen)(cp);
-                 *cp++ = ')';
-                 *cp = '\0';
-              }
+                  VG_(sprintf)(str, "(%s)", name):
+              } else {
+                  VG_(sprintf)(str, "%s", name):
+               }
               ret += myvprintf_str(send, flags, width, buf, 0);
            }
            break;

diff --git a/VEX/switchback/test_ppc_jm1.c b/VEX/switchback/test_ppc_jm1.c
index a17c75c81d9606db4b92a1129bb5a5d3b7dbcdfd..292f433100199df6a8e43b0869122c1757c65016 100644 (file)
--- a/VEX/switchback/test_ppc_jm1.c
+++ b/VEX/switchback/test_ppc_jm1.c
@@ -571,18 +571,16 @@ UInt vprintf_wrk ( void(*send)(HChar), const HChar *format, va_list vargs )
         }
 #        if 0
         case 'y': { /* %y - print symbol */
-           Char buf[100];
-           Char *cp = buf;
            Addr a = va_arg(vargs, Addr);
 
-           if (flags & VG_MSG_PAREN)
-              *cp++ = '(';
-           if (VG_(get_fnname_w_offset)(a, cp, sizeof(buf)-4)) {
+            HChar *name;
+           if (VG_(get_fnname_w_offset)(a, &name)) {
+               HChar buf[1 + VG_strlen(name) + 1 + 1];
               if (flags & VG_MSG_PAREN) {
-                 cp += VG_(strlen)(cp);
-                 *cp++ = ')';
-                 *cp = '\0';
-              }
+                  VG_(sprintf)(str, "(%s)", name):
+              } else {
+                  VG_(sprintf)(str, "%s", name):
+               }
               ret += myvprintf_str(send, flags, width, buf, 0);
            }
            break;