From: Florian Krohm <florian@eich-krohm.de>
Date: Sat, 25 Oct 2014 20:10:30 +0000 (+0000)
Subject: Companion patch of valgrind r14664.
X-Git-Tag: svn/VALGRIND_3_11_0^2~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20c839559acd8b60b072b505fc6e26a6bd1c9d37;p=thirdparty%2Fvalgrind.git

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 7d0af5a829..19fc8223a0 100644
--- 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 9274e710c3..c47ccf8353 100644
--- 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 a17c75c81d..292f433100 100644
--- 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;