Fix various format string errors, courtesy of Florian Krohm.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6902 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/callgrind/bbcc.c b/callgrind/bbcc.c
index 89ebdfd..e31ccc7 100644
--- a/callgrind/bbcc.c
+++ b/callgrind/bbcc.c
@@ -714,7 +714,7 @@
else
ppIRJumpKind( jmpkind );
- VG_(printf)(" %08x -> %08x, SP %08x\n",
+ VG_(printf)(" %08lx -> %08x, SP %08x\n",
last_bb ? bb_jmpaddr(last_bb) : 0,
bb_addr(bb), sp);
}
diff --git a/callgrind/debug.c b/callgrind/debug.c
index ff700ee..aaeedbe 100644
--- a/callgrind/debug.c
+++ b/callgrind/debug.c
@@ -295,7 +295,7 @@
return;
}
- VG_(printf)("%08x/%c %d:", bb_addr(bbcc->bb),
+ VG_(printf)("%08lx/%c %d:", bb_addr(bbcc->bb),
(bbcc->bb->sect_kind == Vg_SectText) ? 'T' :
(bbcc->bb->sect_kind == Vg_SectData) ? 'D' :
(bbcc->bb->sect_kind == Vg_SectBSS) ? 'B' :
@@ -339,9 +339,9 @@
ecounter = bbcc->ecounter_sum;
print_indent(s+2);
- VG_(printf)("ECounter: sum %d ", ecounter);
+ VG_(printf)("ECounter: sum %llu ", ecounter);
for(i=0; i<bb->cjmp_count; i++) {
- VG_(printf)("[%d]=%d ",
+ VG_(printf)("[%d]=%llu ",
bb->jmp[i].instr, bbcc->jmp[i].ecounter);
}
VG_(printf)("\n");
@@ -350,7 +350,7 @@
for(i=0; i<bb->instr_count; i++) {
InstrInfo* ii = &(bb->instr[i]);
print_indent(s+2);
- VG_(printf)("[%2d] IOff %2d ecnt %3d ",
+ VG_(printf)("[%2d] IOff %2d ecnt %3llu ",
i, ii->instr_offset, ecounter);
CLG_(print_cost)(s+5, ii->eventset, bbcc->cost + ii->cost_offset);
@@ -374,7 +374,7 @@
int ln, i=0, opos=0;
if (addr == 0) {
- VG_(printf)("%08x", addr);
+ VG_(printf)("%08lx", addr);
return;
}
@@ -431,7 +431,7 @@
void* CLG_(malloc)(UWord s, char* f)
{
- CLG_DEBUG(3, "Malloc(%d) in %s.\n", s, f);
+ CLG_DEBUG(3, "Malloc(%lu) in %s.\n", s, f);
return VG_(malloc)(s);
}
diff --git a/callgrind/dump.c b/callgrind/dump.c
index dd445e2..2a0442a 100644
--- a/callgrind/dump.c
+++ b/callgrind/dump.c
@@ -554,7 +554,7 @@
void fprint_pos(Int fd, AddrPos* curr, AddrPos* last)
{
if (0) //CLG_(clo).dump_bbs)
- VG_(sprintf)(outbuf, "%u ", curr->addr - curr->bb_addr);
+ VG_(sprintf)(outbuf, "%lu ", curr->addr - curr->bb_addr);
else {
int p = 0;
if (CLG_(clo).dump_instr) {
diff --git a/callgrind/main.c b/callgrind/main.c
index 52cc4b0..7f2abdf 100644
--- a/callgrind/main.c
+++ b/callgrind/main.c
@@ -817,7 +817,7 @@
case VG_USERREQ__DUMP_STATS_AT:
{
Char buf[512];
- VG_(sprintf)(buf,"Client Request: %s", args[1]);
+ VG_(sprintf)(buf,"Client Request: %s", (Char*)args[1]);
CLG_(dump_profile)(buf, True);
*ret = 0; /* meaningless */
}
diff --git a/callgrind/sim.c b/callgrind/sim.c
index f15fc7d..e785e11 100644
--- a/callgrind/sim.c
+++ b/callgrind/sim.c
@@ -309,7 +309,7 @@
return ((res1 == Miss) || (res2 == Miss)) ? Miss : Hit;
} else {
- VG_(printf)("addr: %x size: %u sets: %d %d", a, size, set1, set2);
+ VG_(printf)("addr: %lx size: %u sets: %d %d", a, size, set1, set2);
VG_(tool_panic)("item straddles more than two cache sets");
}
return Hit;
@@ -416,7 +416,7 @@
return ((res1 == Miss) || (res2 == Miss)) ? Miss : Hit;
} else {
- VG_(printf)("addr: %x size: %u sets: %d %d", a, size, set1, set2);
+ VG_(printf)("addr: %lx size: %u sets: %d %d", a, size, set1, set2);
VG_(tool_panic)("item straddles more than two cache sets");
}
return Hit;