From b35b0a9e8502d4cc042a63403ce1011b033285ad Mon Sep 17 00:00:00 2001 From: Florian Kauer Date: Thu, 9 Mar 2023 09:16:55 +0100 Subject: [PATCH 1/2] Fix verbose of check_clocks for 32 bit systems On 32 bit systems uint64_t is long long unsigned int and thus requires %llu in printf to prevent garbled output. Use PRIu64/PRId64 to handle this correctly for both 32 bit and 64 bit systems. Signed-off-by: Florian Kauer --- misc/check_clocks.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/misc/check_clocks.c b/misc/check_clocks.c index 0416f7c..d176fe3 100644 --- a/misc/check_clocks.c +++ b/misc/check_clocks.c @@ -27,6 +27,7 @@ #include #include #include +#include #define ONE_SEC 1000000000LL /* @@ -407,14 +408,14 @@ static int check_local_clock(char *ifname, int verbose) phc_tai = ptp - tai; if (verbose) { - printf("rt tstamp:\t%lu\n", rt); - printf("tai tstamp:\t%lu\n", tai); - printf("phc tstamp:\t%lu\n", ptp); - printf("rt latency:\t%lu\n", lat_rt); - printf("tai latency:\t%lu\n", lat_tai); - printf("phc latency:\t%lu\n", lat_ptp); - printf("phc-rt delta:\t%ld\n", phc_rt); - printf("phc-tai delta:\t%ld\n\n", phc_tai); + printf("rt tstamp:\t%"PRIu64"\n", rt); + printf("tai tstamp:\t%"PRIu64"\n", tai); + printf("phc tstamp:\t%"PRIu64"\n", ptp); + printf("rt latency:\t%"PRIu64"\n", lat_rt); + printf("tai latency:\t%"PRIu64"\n", lat_tai); + printf("phc latency:\t%"PRIu64"\n", lat_ptp); + printf("phc-rt delta:\t%"PRId64"\n", phc_rt); + printf("phc-tai delta:\t%"PRId64"\n\n", phc_tai); } if (llabs(phc_rt - UTC_OFFSET * ONE_SEC) >= 50000) { From 945aa49d878ff578cc5e6fe9fe916f58e58b683e Mon Sep 17 00:00:00 2001 From: Florian Kauer Date: Thu, 9 Mar 2023 09:17:23 +0100 Subject: [PATCH 2/2] Remove unused err variable Signed-off-by: Florian Kauer --- misc/check_clocks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/check_clocks.c b/misc/check_clocks.c index d176fe3..83e40e1 100644 --- a/misc/check_clocks.c +++ b/misc/check_clocks.c @@ -375,7 +375,7 @@ static int check_local_clock(char *ifname, int verbose) uint64_t rt, tai, ptp, lat_rt, lat_tai, lat_ptp; int64_t phc_rt, phc_tai; struct timex t = { 0 }; - int fd_ptp, err; + int fd_ptp; int ret = EXIT_SUCCESS; open_phc_fd(&fd_ptp, ifname);