From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 17 Mar 2008 18:36:55 +0000 (+0000)
Subject: Fixed mismatches between format string and arguments.
X-Git-Tag: svn/VALGRIND_3_4_0~844
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93024414ae357d92f2c491bc8f5830037d2a3656;p=thirdparty%2Fvalgrind.git

Fixed mismatches between format string and arguments.

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

diff --git a/exp-drd/drd_error.c b/exp-drd/drd_error.c
index ef72522746..e68e6a604f 100644
--- a/exp-drd/drd_error.c
+++ b/exp-drd/drd_error.c
@@ -138,8 +138,8 @@ static void drd_tool_error_pp(Error* const e)
     CondErrInfo* cdei =(CondErrInfo*)(VG_(get_error_extra)(e));
     VG_(message)(Vg_UserMsg,
                  "%s: cond 0x%lx",
-                 cdei->cond,
-                 VG_(get_error_string)(e));
+                 VG_(get_error_string)(e),
+                 cdei->cond);
     VG_(pp_ExeContext)(VG_(get_error_where)(e));
     break;
   }
@@ -157,6 +157,7 @@ static void drd_tool_error_pp(Error* const e)
     CondDestrErrInfo* cdi = (CondDestrErrInfo*)(VG_(get_error_extra)(e));
     VG_(message)(Vg_UserMsg,
                  "%s: cond 0x%lx, mutex 0x%lx locked by thread %d/%d",
+                 VG_(get_error_string)(e),
                  cdi->cond, cdi->mutex,
                  DrdThreadIdToVgThreadId(cdi->tid), cdi->tid);
     VG_(pp_ExeContext)(VG_(get_error_where)(e));