Added support for multi-skin suppressions, of the form:

  skin_name1,skin_name2:supp_name

No spaces are allowed on either side of the comma.

This is useful for sharing suppressions between Addrcheck and Memcheck.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1205 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/linux22.supp b/linux22.supp
index 9260b94..3210817 100644
--- a/linux22.supp
+++ b/linux22.supp
@@ -29,7 +29,7 @@
 
 {
    socketcall.connect(serv_addr)/__libc_connect/*(Param)
-   Memcheck:Param
+   Addrcheck,Memcheck:Param
    socketcall.connect(serv_addr)
    fun:__libc_connect
    fun:*
@@ -37,7 +37,7 @@
 
 {
    strrchr/_dl_map_object_from_fd/_dl_map_object(Addr4)
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:strrchr
    fun:_dl_map_object_from_fd
    fun:_dl_map_object
@@ -53,7 +53,7 @@
 
 {
    llseek(result)/__libc_lseek64/_IO_file_seek(Param)
-   Memcheck:Param
+   Addrcheck,Memcheck:Param
    llseek(result)
    fun:__libc_lseek64
    fun:_IO_file_seek
@@ -61,7 +61,7 @@
 
 {
    __rawmemchr/_nl_*/*locale(Addr4)
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:__rawmemchr
    fun:_nl_*
    fun:*locale
@@ -149,7 +149,7 @@
 
 {
    socketcall.connect(serv_addr)/__libc_connect/*(Param)
-   Memcheck:Param
+   Addrcheck,Memcheck:Param
    socketcall.connect(serv_addr)
    obj:*libc-2.1.3.so
    obj:*libX11.so*
@@ -178,7 +178,7 @@
 
 {
    X11-Addr4-1
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libX11.so.6.1
    obj:/usr/X11R6/lib/libX11.so.6.1
    obj:/usr/X11R6/lib/libX11.so.6.1
@@ -186,7 +186,7 @@
 
 {
    X11-Addr4-2
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libX11.so.6.1
    obj:/usr/X11R6/lib/libX11.so.6.1
    obj:/usr/X11R6/lib/libXt.so.6.0
@@ -194,7 +194,7 @@
 
 {
    X11-Addr4-3
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXt.so.6.0
@@ -202,7 +202,7 @@
 
 {
    X11-Addr4-4
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libX11.so.6.1
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXt.so.6.0
@@ -210,7 +210,7 @@
 
 {
    X11-Addr4-5
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    fun:__rawmemchr
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXt.so.6.0
@@ -218,7 +218,7 @@
 
 {
    X11-Addr4-6
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libXmu.so.6.0
    obj:/usr/X11R6/lib/libXmu.so.6.0
    obj:/usr/X11R6/lib/libXt.so.6.0
@@ -226,7 +226,7 @@
 
 {
    X11-Addr4-7
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXawXpm_posing_as_Xaw.so.6.1
@@ -234,7 +234,7 @@
 
 {
    X11-Param-1
-   Memcheck:Param
+   Addrcheck,Memcheck:Param
    write(buf)
    fun:__libc_write
    obj:/usr/X11R6/lib/libX11.so.6.1
@@ -243,7 +243,7 @@
 
 {
    X11-Addr4-8
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libX11.so.6.1
    obj:/usr/X11R6/lib/libXpm.so.4.11
    obj:/usr/X11R6/lib/libXpm.so.4.11
@@ -251,7 +251,7 @@
 
 {
    X11-Addr4-8
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXawXpm_posing_as_Xaw.so.6.1
    obj:/usr/X11R6/lib/libXt.so.6.0
@@ -259,7 +259,7 @@
 
 {
    X11-Addr4-9
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libXaw.so.6.1
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXt.so.6.0
@@ -267,7 +267,7 @@
 
 {
    X11-Addr4-10
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libXaw.so.6.1
    obj:/usr/X11R6/lib/libXaw.so.6.1
    obj:/usr/X11R6/lib/libXt.so.6.0
@@ -275,7 +275,7 @@
 
 {
    X11-Addr4-11
-   Memcheck:Addr4
+   Addrcheck,Memcheck:Addr4
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXt.so.6.0
    obj:/usr/X11R6/lib/libXaw.so.6.1