Qualifying suppression types with the skin name, like this:
memcheck:Addr4
Changed the `name' need of the memcheck skin from "valgrind" to "memcheck" for
this. But the name Valgrind will return when I print core and skin names in
the startup message.
One issue is that some skins share suppression types, eg. memcheck and
addrcheck. Might be useful to allow multi-skin suppressions, viz:
memcheck,addrcheck:Addr4
This won't be too hard to tack on, though.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1163 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/xfree-4.supp b/xfree-4.supp
index 2ac9dc8..35ada35 100644
--- a/xfree-4.supp
+++ b/xfree-4.supp
@@ -6,20 +6,28 @@
# Format of this file is:
# {
# name_of_suppression
-# kind: one of Param Value1 Value2 Value4 Value8
-# Free Addr1 Addr2 Addr4 Addr8
-# Cond (previously known as Value0)
-# (if Param: name of system call param, if Free: name of free-ing fn)
+# skin_name:supp_kind
+# (optional extra info for some suppression types)
# caller0 name, or /name/of/so/file.so
# caller1 name, or ditto
# (optionally: caller2 name)
# (optionally: caller3 name)
# }
+#
+# For memcheck, the supp_kinds are:
+#
+# Param Value1 Value2 Value4 Value8
+# Free Addr1 Addr2 Addr4 Addr8
+# Cond (previously known as Value0)
+#
+# and the optional extra info is:
+# if Param: name of system call param
+# if Free: name of free-ing fn)
{
libX11.so.6.2/libX11.so.6.2/libX11.so.6.2(Cond)
- Cond
+ memcheck:Cond
obj:/usr/X11R6/lib/libX11.so.6.2
obj:/usr/X11R6/lib/libX11.so.6.2
obj:/usr/X11R6/lib/libX11.so.6.2
@@ -27,7 +35,7 @@
{
libXt.so.6.2/libXt.so.6.2/libXt.so.6.2(Cond)
- Cond
+ memcheck:Cond
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -36,7 +44,7 @@
{
libXaw.so.7.0/libXaw.so.7.0/libXaw.so.7.0(Cond)
- Cond
+ memcheck:Cond
obj:/usr/X11R6/lib/libXaw.so.7.0
obj:/usr/X11R6/lib/libXaw.so.7.0
obj:/usr/X11R6/lib/libXaw.so.7.0
@@ -44,7 +52,7 @@
{
libXmu.so.6.2/libXmu.so.6.2/libXmu.so.6.2(Cond)
- Cond
+ memcheck:Cond
obj:/usr/X11R6/lib/libXmu.so.6.2
obj:/usr/X11R6/lib/libXmu.so.6.2
obj:/usr/X11R6/lib/libXmu.so.6.2
@@ -52,7 +60,7 @@
{
libXt.so.6.0/libXt.so.6.0/libXaw.so.7.0(Cond)
- Cond
+ memcheck:Cond
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXt.so.6.0
obj:/usr/X11R6/lib/libXaw.so.7.0
@@ -60,7 +68,7 @@
{
libXaw.so.7.0/libXaw.so.7.0/libXt.so.6.0(Value4)
- Value4
+ memcheck:Value4
obj:/usr/X11R6/lib/libXaw.so.7.0
obj:/usr/X11R6/lib/libXaw.so.7.0
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -68,7 +76,7 @@
{
libXaw.so.7.0/libXaw.so.7.0/libXt.so.6.0(Cond)
- Cond
+ memcheck:Cond
obj:/usr/X11R6/lib/libXaw.so.7.0
obj:/usr/X11R6/lib/libXaw.so.7.0
obj:/usr/X11R6/lib/libXt.so.6.0
@@ -76,7 +84,7 @@
{
libX11.so.6.2/libX11.so.6.2/libXaw.so.7.0(Cond)
- Cond
+ memcheck:Cond
obj:/usr/X11R6/lib/libX11.so.6.2
obj:/usr/X11R6/lib/libX11.so.6.2
obj:/usr/X11R6/lib/libXaw.so.7.0
@@ -84,7 +92,7 @@
{
libX11.so.6.2/libXaw.so.7.0/libXaw.so.7.0(Cond)
- Cond
+ memcheck:Cond
obj:/usr/X11R6/lib/libX11.so.6.2
obj:/usr/X11R6/lib/libXaw.so.7.0
obj:/usr/X11R6/lib/libXaw.so.7.0
@@ -92,7 +100,7 @@
{
libXpm.so.4.11/libXpm.so.4.11/libXpm.so.4.11
- Cond
+ memcheck:Cond
obj:/usr/X11R6/lib/libXpm.so.4.11
obj:/usr/X11R6/lib/libXpm.so.4.11
obj:/usr/X11R6/lib/libXpm.so.4.11