From 46d1e5a17f17b8798865446191bb3a3a620cea95 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Fri, 5 Jul 2019 13:23:51 +1200 Subject: [PATCH] tipcutils/utils: fix printf format warnings on 32-bit platforms Use PRIu64 when printing a uint64_t so that both 32-bit and 64-bit platforms use the correct format specifier. Signed-off-by: Chris Packham Conflict: NA Reference: https://sourceforge.net/p/tipc/tipcutils/ci/46d1e5a17f17b8798865446191bb3a3a620cea95/ --- utils/tipc-link-watcher/tipc-link-watcher.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/tipc-link-watcher/tipc-link-watcher.c b/utils/tipc-link-watcher/tipc-link-watcher.c index 943ea4f..f805e1c 100644 --- a/utils/tipc-link-watcher/tipc-link-watcher.c +++ b/utils/tipc-link-watcher/tipc-link-watcher.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -578,7 +579,7 @@ static void print_uc_samples_to_file(char *filename, fprintf(csv_fp,"priority(%u), ", (*samples)[link].link_props.priority[link]); fprintf(csv_fp,"tolerance(%u ms), ", (*samples)[link].link_props.tolerance[link]); fprintf(csv_fp,"window(%u packets), ", (*samples)[link].link_props.window[link]); - fprintf(csv_fp,"link_up(%lu), link_down(%lu)", + fprintf(csv_fp,"link_up(%" PRIu64 "), link_down(%" PRIu64 ")", (*samples)[link].link_state.up, (*samples)[link].link_state.down); fprintf(csv_fp,"\n"); /* skip link_state*/ @@ -1354,7 +1355,7 @@ static int l1_unicast_sample(int index, IF_WATCH(w_linkp->action, (look_up_link_index(uc_dp->samples[index].link_info.link, w_linkp->action_list, w_linkp->action) >= 0), - printf("\n%s: link reset:%-10lu ", (uc_dp)->samples[index].link_info.link, (uc_dp)->samples[index].link_state.down)); + printf("\n%s: link reset:%-10" PRIu64 " ", (uc_dp)->samples[index].link_info.link, (uc_dp)->samples[index].link_state.down)); for (i = PRIV_TIPC_NLA_STATS_RX_PACKETS; i < __PRIV_TIPC_NLA_STATS_MAX; i++) { stat_p = (uint32_t *)(uintptr_t)*offset_p; -- 2.41.0