drd, XML: more XML output consistency improvements

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

diff --git a/drd/drd_error.c b/drd/drd_error.c
index 334c020d8accb06ea879f726ee336001c8d976ce..eeea48445357f3b69f7b81f9f27424b9a5493e63 100644 (file)
--- a/drd/drd_error.c
+++ b/drd/drd_error.c
@@ -352,8 +352,8 @@ static void drd_tool_error_pp(Error* const e)
    case SemaphoreErr: {
       SemaphoreErrInfo* sei = (SemaphoreErrInfo*)(VG_(get_error_extra)(e));
       tl_assert(sei);
-      print_err_detail("%s%s: semaphore 0x%lx%s\n", VG_(get_error_string)(e),
-                       what_prefix, sei->semaphore, what_suffix);
+      print_err_detail("%s%s: semaphore 0x%lx%s\n", what_prefix,
+                       VG_(get_error_string)(e), sei->semaphore, what_suffix);
       VG_(pp_ExeContext)(VG_(get_error_where)(e));
       first_observed(sei->semaphore);
       break;
@@ -394,13 +394,13 @@ static void drd_tool_error_pp(Error* const e)
       else
          print_err_detail("Acquired at:\n");
       VG_(pp_ExeContext)(p->acquired_at);
+      if (xml)
+         print_err_detail("  </acquired_at>\n");
       print_err_detail("%sLock on %s 0x%lx was held during %d ms"
                        " (threshold: %d ms).%s\n", what_prefix,
                        VG_(get_error_string)(e), p->synchronization_object,
                        p->hold_time_ms, p->threshold_ms, what_suffix);
       VG_(pp_ExeContext)(VG_(get_error_where)(e));
-      if (xml)
-         print_err_detail("  </acquired_at>\n");
       first_observed(p->synchronization_object);
       break;
    }