[Valgrind-developers] valgrind: r5481 - branches/VALGRIND_3_1_BRANCH/coregrind

[<sv...@va...>]

Author: dirk
Date: 2006-01-02 20:46:06 +0000 (Mon, 02 Jan 2006)
New Revision: 5481

Log:
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.

Modified:
   branches/VALGRIND_3_1_BRANCH/coregrind/m_errormgr.c


Modified: branches/VALGRIND_3_1_BRANCH/coregrind/m_errormgr.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/coregrind/m_errormgr.c	2006-01-02 20:44:=
14 UTC (rev 5480)
+++ branches/VALGRIND_3_1_BRANCH/coregrind/m_errormgr.c	2006-01-02 20:46:=
06 UTC (rev 5481)
@@ -404,19 +404,21 @@
    if (stop_at > VG_MAX_SUPP_CALLERS) stop_at =3D VG_MAX_SUPP_CALLERS;
    vg_assert(stop_at > 0);
=20
-   VG_(printf)("{\n");
-   VG_(printf)("   <insert a suppression name here>\n");
-
    if (ThreadErr =3D=3D err->ekind || MutexErr =3D=3D err->ekind) {
+      VG_(printf)("{\n");
+      VG_(printf)("   <insert a suppression name here>\n");
       VG_(printf)("   core:PThread\n");
=20
    } else {
       Char* name =3D VG_TDICT_CALL(tool_get_error_name, err);
       if (NULL =3D=3D name) {
          VG_(message)(Vg_UserMsg,=20
-                      "(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);
    }