| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From dcb5d3e5d47b1e01fdcde575badc51825d4f4681 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 3 Jan 2023 13:36:01 -0800 |
| 4 | Subject: [PATCH] timeSync: Portable way to print 64bit time_t |
| 5 | |
| 6 | This ensures when 64bit time_t is used on 32bit architectures ( |
| 7 | -D_TIME_BITS=64 ) then it can print it correctly as well. |
| 8 | |
| 9 | Fixes |
| 10 | pllLinux.c:43:20: error: format specifies type 'long' but the argument has type 'long long' [-Werror,-Wformat] |
| 11 | | prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, |
| 12 | | ^~~~~~~~~~ |
| 13 | |
| 14 | Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/631] |
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 16 | --- |
| 17 | open-vm-tools/services/plugins/timeSync/pllLinux.c | 8 ++++---- |
| 18 | open-vm-tools/services/plugins/timeSync/slewLinux.c | 2 +- |
| 19 | 2 files changed, 5 insertions(+), 5 deletions(-) |
| 20 | |
| 21 | diff --git a/open-vm-tools/services/plugins/timeSync/pllLinux.c b/open-vm-tools/services/plugins/timeSync/pllLinux.c |
| 22 | index e9c8e61de..90ba8c63f 100644 |
| 23 | --- a/open-vm-tools/services/plugins/timeSync/pllLinux.c |
| 24 | +++ b/open-vm-tools/services/plugins/timeSync/pllLinux.c |
| 25 | @@ -38,10 +38,10 @@ |
| 26 | static void |
| 27 | TimeSyncLogPLLState(const char *prefix, struct timex *tx) |
| 28 | { |
| 29 | - g_debug("%s : off %ld freq %ld maxerr %ld esterr %ld status %d " |
| 30 | - "const %ld precision %ld tolerance %ld tick %ld\n", |
| 31 | - prefix, tx->offset, tx->freq, tx->maxerror, tx->esterror, |
| 32 | - tx->status, tx->constant, tx->precision, tx->tolerance, tx->tick); |
| 33 | + g_debug("%s : off %jd freq %jd maxerr %jd esterr %jd status %d " |
| 34 | + "const %jd precision %jd tolerance %jd tick %jd\n", |
| 35 | + prefix, (intmax_t)tx->offset, (intmax_t)tx->freq, (intmax_t)tx->maxerror, (intmax_t)tx->esterror, |
| 36 | + tx->status, (intmax_t)tx->constant, (intmax_t)tx->precision, (intmax_t)tx->tolerance, (intmax_t)tx->tick); |
| 37 | } |
| 38 | |
| 39 | /* |
| 40 | diff --git a/open-vm-tools/services/plugins/timeSync/slewLinux.c b/open-vm-tools/services/plugins/timeSync/slewLinux.c |
| 41 | index 1ab6e3584..0c304b5d7 100644 |
| 42 | --- a/open-vm-tools/services/plugins/timeSync/slewLinux.c |
| 43 | +++ b/open-vm-tools/services/plugins/timeSync/slewLinux.c |
| 44 | @@ -156,6 +156,6 @@ TimeSync_Slew(int64 delta, |
| 45 | g_debug("adjtimex failed: %s\n", strerror(errno)); |
| 46 | return FALSE; |
| 47 | } |
| 48 | - g_debug("time slew start: %ld\n", tx.tick); |
| 49 | + g_debug("time slew start: %jd\n", (intmax_t)tx.tick); |
| 50 | return TRUE; |
| 51 | } |
| 52 | -- |
| 53 | 2.39.0 |
| 54 | |