commit ea71ffb08eccc0869c5b9421160fef4052e35c23
author florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Wed Aug 05 14:38:57 2015 +0000
committer florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Wed Aug 05 14:38:57 2015 +0000
tree 5c3083e64eeaa3fe132246a34ad51bebb4d05c13
parent 686870c103c1add7b4d455c62585419c524b4b00

Fix printf format inconsistencies as pointed out by gcc -Wformat-signedness.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15495 a5019735-40e9-0310-863c-91ae7b9d1cf9

drd/drd_error.c

diff --git a/drd/drd_error.c b/drd/drd_error.c
index eb92689..fd963df 100644
--- a/drd/drd_error.c
+++ b/drd/drd_error.c
@@ -199,7 +199,7 @@
       describe_malloced_addr(dri->addr, &ai);
    }
 
-   print_err_detail("%sConflicting %s by thread %d at 0x%08lx size %ld%s\n",
+   print_err_detail("%sConflicting %s by thread %u at 0x%08lx size %lu%s\n",
                     what_prefix, dri->access_type == eStore ? "store" : "load",
                     dri->tid, dri->addr, dri->size, what_suffix);
 
@@ -316,7 +316,7 @@
       MutexErrInfo* p = (MutexErrInfo*)(VG_(get_error_extra)(e));
       tl_assert(p);
       if (p->recursion_count >= 0) {
-         print_err_detail("%s%s: mutex 0x%lx, recursion count %d, owner %d."
+         print_err_detail("%s%s: mutex 0x%lx, recursion count %d, owner %u."
                           "%s\n", what_prefix, VG_(get_error_string)(e),
                           p->mutex, p->recursion_count, p->owner, what_suffix);
       } else {
@@ -337,7 +337,7 @@
    }
    case CondDestrErr: {
       CondDestrErrInfo* cdi = (CondDestrErrInfo*)(VG_(get_error_extra)(e));
-      print_err_detail("%s%s: cond 0x%lx, mutex 0x%lx locked by thread %d%s\n",
+      print_err_detail("%s%s: cond 0x%lx, mutex 0x%lx locked by thread %u%s\n",
                        what_prefix, VG_(get_error_string)(e), cdi->cond,
                        cdi->mutex, cdi->owner, what_suffix);
       VG_(pp_ExeContext)(VG_(get_error_where)(e));
@@ -384,7 +384,7 @@
       if (bei->other_context) {
          if (xml)
             print_err_detail("  <confl_wait_call>\n");
-         print_err_detail("%sConflicting wait call by thread %d:%s\n",
+         print_err_detail("%sConflicting wait call by thread %u:%s\n",
                           what_prefix, bei->other_tid, what_suffix);
          VG_(pp_ExeContext)(bei->other_context);
          if (xml)
@@ -413,8 +413,8 @@
       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,
+      print_err_detail("%sLock on %s 0x%lx was held during %u ms"
+                       " (threshold: %u 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));