timeSync: Portable way to print 64bit time_t

This ensures when 64bit time_t is used on 32bit architectures ( -D_TIME_BITS=64 ) then it can print it correctly as well. Fixes pllLinux.c:43:20: error: format specifies type 'long' but the argument has type 'long long' [-Werror,-Wformat] | prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, | ^~~~~~~~~~ Signed-off-by: Khem Raj <[email protected]>
vmware · Jan 6, 2023 · ce20bc3 · ce20bc3
1 parent 0ab6ba9
commit ce20bc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/open-vm-tools/services/plugins/timeSync/pllLinux.c b/open-vm-tools/services/plugins/timeSync/pllLinux.c
@@ -38,10 +38,10 @@
 static void
 TimeSyncLogPLLState(const char *prefix, struct timex *tx)
 {
-   g_debug("%s : off %ld freq %ld maxerr %ld esterr %ld status %d "
-           "const %ld precision %ld tolerance %ld tick %ld\n",
-           prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, 
-           tx->status, tx->constant, tx->precision, tx->tolerance, tx->tick);
+   g_debug("%s : off %jd freq %jd maxerr %jd esterr %jd status %d "
+           "const %jd precision %jd tolerance %jd tick %jd\n",
+           prefix, (intmax_t)tx->offset, (intmax_t)tx->freq, (intmax_t)tx->maxerror, (intmax_t)tx->esterror, 
+           tx->status, (intmax_t)tx->constant, (intmax_t)tx->precision, (intmax_t)tx->tolerance, (intmax_t)tx->tick);
 }
 
 /*

diff --git a/open-vm-tools/services/plugins/timeSync/slewLinux.c b/open-vm-tools/services/plugins/timeSync/slewLinux.c
@@ -156,6 +156,6 @@ TimeSync_Slew(int64 delta,
       g_debug("adjtimex failed: %s\n", strerror(errno));
       return FALSE;
    }
-   g_debug("time slew start: %ld\n", tx.tick);
+   g_debug("time slew start: %jd\n", (intmax_t)tx.tick);
    return TRUE;
 }