Fixed minor printf bogons.

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

diff --git a/cachegrind/cg_main.c b/cachegrind/cg_main.c
index 63c3e627218187c1bf4f441c8efc49d3964f0c28..0057de8fec911d1f83d25dd313185414ecdc5e9d 100644 (file)
--- a/cachegrind/cg_main.c
+++ b/cachegrind/cg_main.c
@@ -1633,7 +1633,7 @@ Int commify(ULong n, int field_width, char buf[COMMIFY_BUF_LEN])
 {
    int len, n_commas, i, j, new_len, space;
 
-   VG_(sprintf)(buf, "%lu", n);
+   VG_(sprintf)(buf, "%llu", n);
    len = VG_(strlen)(buf);
    n_commas = (len - 1) / 3;
    new_len = len + n_commas;

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index aca07cc7f70a10894b4af45d60da05d57d444377..bb75f0b065cb3679e6813004d0f6b5fb89203522 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1327,7 +1327,7 @@ static void vg_show_counts ( void )
                 VG_(overall_out_tsize),
                 safe_idiv(10*VG_(overall_out_tsize), VG_(overall_out_osize)));
    VG_(message)(Vg_DebugMsg,
-      " dispatch: %lu jumps (bb entries), of which %u (%lu%%) were unchained.", 
+      " dispatch: %llu jumps (bb entries), of which %u (%lu%%) were unchained.",
       VG_(bbs_done), 
       VG_(unchained_jumps_done),
       ((ULong)(100) * (ULong)(VG_(unchained_jumps_done)))

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index 72f33d6a263265ae6cbad551bded79472529b248..ea8f35549b7f79b0542347b7f30f9f7ec61a862e 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -1570,7 +1570,7 @@ VgSchedReturnCode VG_(scheduler) ( void )
                                    tid, done_this_time, (Int)trc );
 
       if (0 && trc != VG_TRC_INNER_FASTMISS)
-         VG_(message)(Vg_DebugMsg, "thread %d:  %ld bbs, event %s", 
+         VG_(message)(Vg_DebugMsg, "thread %d:  %llu bbs, event %s", 
                                    tid, VG_(bbs_done),
                                    name_of_sched_event(trc) );
 

diff --git a/coregrind/vg_translate.c b/coregrind/vg_translate.c
index 9c21425f0113cfc4693ece23215bd3f7741c1a47..577cc1386078bd94a96f5cfdd630026cea58f4b8 100644 (file)
--- a/coregrind/vg_translate.c
+++ b/coregrind/vg_translate.c
@@ -2189,7 +2189,7 @@ void VG_(translate) ( /*IN*/  ThreadState* tst,
       Char fnname[64] = "";
       VG_(get_fnname_if_entry)(orig_addr, fnname, 64);
       VG_(printf)(
-              "==== BB %d %s(%p) in %dB, out %dB, BBs exec'd %lu ====\n\n",
+              "==== BB %d %s(%p) in %dB, out %dB, BBs exec'd %llu ====\n\n",
               VG_(overall_in_count), fnname, orig_addr, 
               VG_(overall_in_osize), VG_(overall_in_tsize),
               VG_(bbs_done));

diff --git a/coregrind/vg_transtab.c b/coregrind/vg_transtab.c
index 0808d102bd20e8fd2f4a6c6b4af3cfa05b6e430b..256b1e5b8a90e0e5a20991357272e9da1e4d0495 100644 (file)
--- a/coregrind/vg_transtab.c
+++ b/coregrind/vg_transtab.c
@@ -194,7 +194,7 @@ void pp_tt_tc_status ( Char* submsg )
       tc_used += vg_tc_used[s];
 
    VG_(message)(Vg_DebugMsg, 
-       "%luk bbs: tt %d, tc %d, %s",
+       "%lluk bbs: tt %d, tc %d, %s",
        VG_(bbs_done) / 1000,
        vg_tt_used, tc_used, submsg );
 }