From: Dirk Mueller <daywalker@users.sourceforge.net>
Date: Mon, 2 Jan 2006 20:46:06 +0000 (+0000)
Subject: backport r5382 from trunk:
X-Git-Tag: svn/VALGRIND_3_1_1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=007b3c772dd3b7beaf6b7d720c21816d34a04386;p=thirdparty%2Fvalgrind.git

backport r5382 from trunk:
r5382 | njn | 2005-12-19 20:40:12 +0100 (Mon, 19 Dec 2005) | 3 lines

Fix a minor --gen-suppressions output bug.


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH@5481
---

diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index a5fd02d959..5f6ae9db96 100644
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -404,19 +404,21 @@ static void gen_suppression(Error* err)
    if (stop_at > VG_MAX_SUPP_CALLERS) stop_at = VG_MAX_SUPP_CALLERS;
    vg_assert(stop_at > 0);
 
-   VG_(printf)("{\n");
-   VG_(printf)("   <insert a suppression name here>\n");
-
    if (ThreadErr == err->ekind || MutexErr == err->ekind) {
+      VG_(printf)("{\n");
+      VG_(printf)("   <insert a suppression name here>\n");
       VG_(printf)("   core:PThread\n");
 
    } else {
       Char* name = VG_TDICT_CALL(tool_get_error_name, err);
       if (NULL == name) {
          VG_(message)(Vg_UserMsg, 
-                      "(tool does not allow error to be suppressed)");
+                      "(%s does not allow error to be suppressed)",
+                      VG_(details).name);
          return;
       }
+      VG_(printf)("{\n");
+      VG_(printf)("   <insert a suppression name here>\n");
       VG_(printf)("   %s:%s\n", VG_(details).name, name);
       VG_TDICT_CALL(tool_print_extra_suppression_info, err);
    }