Resolved function redirection conflict.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7643

diff --git a/exp-drd/drd_pthread_intercepts.c b/exp-drd/drd_pthread_intercepts.c
index 0d132cb707647f0236c06aca80a931fad659c136..febc156ca88f1b5d35cff74d11c5a52fdedeef1a 100644 (file)
--- a/exp-drd/drd_pthread_intercepts.c
+++ b/exp-drd/drd_pthread_intercepts.c
@@ -656,7 +656,7 @@ PTH_FUNC(int, semZuinitZAGLIBCZu2Zd0, // sem_init@GLIBC_2.0
    return ret;
 }
 
-PTH_FUNC(int, semZuinitZa, // sem_init*
+PTH_FUNC(int, semZuinitZAZAZa, // sem_init@@*
               sem_t *sem,
               int pshared,
               unsigned int value)
@@ -721,7 +721,7 @@ PTH_FUNC(int, semZuwaitZAGLIBCZu2Zd0, // sem_wait@GLIBC_2.0
 }
 
 // sem_wait
-PTH_FUNC(int, semZuwaitZa, // sem_wait*
+PTH_FUNC(int, semZuwaitZAZAZa, // sem_wait@@*
               sem_t *sem)
 {
    int   ret;
@@ -800,7 +800,7 @@ PTH_FUNC(int, semZupostZAGLIBCZu2Zd0, // sem_post@GLIBC_2.0
 }
 
 // sem_post
-PTH_FUNC(int, semZupostZa, // sem_post*
+PTH_FUNC(int, semZupostZAZAZa, // sem_post@@*
               sem_t *sem)
 {
    int   ret;

diff --git a/exp-drd/tests/tc18_semabuse.stderr.exp b/exp-drd/tests/tc18_semabuse.stderr.exp
index 7b21919cab44424498ee57f2bf2f02be36405173..56a5a537d5617c7c2005236d52421e32db64f39b 100644 (file)
--- a/exp-drd/tests/tc18_semabuse.stderr.exp
+++ b/exp-drd/tests/tc18_semabuse.stderr.exp
@@ -1,6 +1,6 @@
 
 Invalid semaphore: semaphore 0x........
-   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
+   at 0x........: sem_wait@@* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc18_semabuse.c:34)
 
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)

diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp b/exp-drd/tests/tc20_verifywrap.stderr.exp
index 1efc93fe233f3d391c1a6ac30b309a540e7fec94..81f9dbb3170e235ba2a8fda2b7f62b28b81309e2 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap.stderr.exp
+++ b/exp-drd/tests/tc20_verifywrap.stderr.exp
@@ -92,7 +92,7 @@ FIXME: can't figure out how to verify wrap of sem_destroy
 
 
 Invalid semaphore: semaphore 0x........
-   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
+   at 0x........: sem_wait@@* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:242)
 
 FIXME: can't figure out how to verify wrap of sem_post

diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp b/exp-drd/tests/tc20_verifywrap2.stderr.exp
index b02f57cf517adfff7e6deb9857415ffe9916349e..05d5edb609046b5c2292ec4351e2db298c2ce854 100644 (file)
--- a/exp-drd/tests/tc20_verifywrap2.stderr.exp
+++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp
@@ -120,7 +120,7 @@ FIXME: can't figure out how to verify wrap of sem_destroy
 [1/1] semaphore_post_wait 0x........
 
 Invalid semaphore: semaphore 0x........
-   at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
+   at 0x........: sem_wait@@* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:242)
 [1/1] semaphore_post 0x........