DRD: fix issues reported by the IBM static analysis tool.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11719 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/drd_cond.c b/drd/drd_cond.c
index e52cf86..70d457e 100644
--- a/drd/drd_cond.c
+++ b/drd/drd_cond.c
@@ -300,22 +300,15 @@
p = DRD_(cond_get)(cond);
if (!p)
{
- struct mutex_info* q;
- q = &(DRD_(clientobj_get)(p->mutex, ClientMutex)->mutex);
- {
- CondDestrErrInfo cde = {
- DRD_(thread_get_running_tid)(),
- p->a1,
- q ? q->a1 : 0,
- q ? q->owner : DRD_INVALID_THREADID
- };
- VG_(maybe_record_error)(VG_(get_running_tid)(),
- CondDestrErr,
- VG_(get_IP)(VG_(get_running_tid)()),
- "condition variable has been destroyed while"
- " being waited upon",
- &cde);
- }
+ CondDestrErrInfo cde = {
+ DRD_(thread_get_running_tid)(), cond, 0, DRD_INVALID_THREADID
+ };
+ VG_(maybe_record_error)(VG_(get_running_tid)(),
+ CondDestrErr,
+ VG_(get_IP)(VG_(get_running_tid)()),
+ "condition variable has been destroyed while"
+ " being waited upon",
+ &cde);
return;
}