Reverted last commit.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7644 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/exp-drd/drd_pthread_intercepts.c b/exp-drd/drd_pthread_intercepts.c
index febc156..0d132cb 100644
--- a/exp-drd/drd_pthread_intercepts.c
+++ b/exp-drd/drd_pthread_intercepts.c
@@ -656,7 +656,7 @@
return ret;
}
-PTH_FUNC(int, semZuinitZAZAZa, // sem_init@@*
+PTH_FUNC(int, semZuinitZa, // sem_init*
sem_t *sem,
int pshared,
unsigned int value)
@@ -721,7 +721,7 @@
}
// sem_wait
-PTH_FUNC(int, semZuwaitZAZAZa, // sem_wait@@*
+PTH_FUNC(int, semZuwaitZa, // sem_wait*
sem_t *sem)
{
int ret;
@@ -800,7 +800,7 @@
}
// sem_post
-PTH_FUNC(int, semZupostZAZAZa, // sem_post@@*
+PTH_FUNC(int, semZupostZa, // 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 56a5a53..7b21919 100644
--- 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 81f9dbb..1efc93f 100644
--- a/exp-drd/tests/tc20_verifywrap.stderr.exp
+++ b/exp-drd/tests/tc20_verifywrap.stderr.exp
@@ -92,7 +92,7 @@
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 05d5edb..b02f57c 100644
--- a/exp-drd/tests/tc20_verifywrap2.stderr.exp
+++ b/exp-drd/tests/tc20_verifywrap2.stderr.exp
@@ -120,7 +120,7 @@
[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........