From e525cc55d4477e23466bbffb833644c06cda32bb Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 16 Apr 2018 00:45:09 +0900 Subject: [PATCH] use PRIu64 to format uint64_t --- common/arch.h | 3 +++ libxrdp/xrdp_orders.c | 2 +- sesman/chansrv/chansrv.h | 2 +- sesman/chansrv/chansrv_fuse.c | 8 ++++---- sesman/chansrv/clipboard.c | 8 ++++---- sesman/chansrv/clipboard_file.c | 8 ++++---- sesman/chansrv/devredir.c | 6 +++--- sesman/chansrv/irp.c | 6 +++--- sesman/chansrv/mlog.h | 10 +++++----- sesman/chansrv/smartcard.c | 6 +++--- sesman/chansrv/smartcard_pcsc.c | 2 +- tests/common/os_calls/g_time.c | 18 +++++++++--------- vnc/vnc.c | 2 +- xrdp/xrdp_bitmap.c | 2 +- xrdp/xrdp_cache.c | 2 +- xrdp/xrdp_encoder.c | 2 +- xrdp/xrdp_mm.c | 2 +- xrdp/xrdp_painter.c | 2 +- 18 files changed, 47 insertions(+), 44 deletions(-) diff --git a/common/arch.h b/common/arch.h index ccccfa5a..4eba4e1d 100644 --- a/common/arch.h +++ b/common/arch.h @@ -43,6 +43,9 @@ typedef unsigned long uintptr_t; #endif #endif +#define __STDC_FORMAT_MACROS +#include + typedef int bool_t; /* you can define L_ENDIAN or B_ENDIAN and NEED_ALIGN or NO_NEED_ALIGN diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c index 81819d2c..ab48f80f 100644 --- a/libxrdp/xrdp_orders.c +++ b/libxrdp/xrdp_orders.c @@ -33,7 +33,7 @@ { \ if (_log_level < LLOG_LEVEL) \ { \ - g_write("xrdp_orders.c [%10.10lld]: ", g_time3()); \ + g_write("xrdp_orders.c [%"PRIu64"]: ", g_time3()); \ g_writeln _params ; \ } \ } diff --git a/sesman/chansrv/chansrv.h b/sesman/chansrv/chansrv.h index 22bdd5be..a1599fbe 100644 --- a/sesman/chansrv/chansrv.h +++ b/sesman/chansrv/chansrv.h @@ -71,7 +71,7 @@ int remove_struct_with_chan_id(tui32 dvc_chan_id); { \ if (_a < LOG_LEVEL) \ { \ - g_write("xrdp-chansrv [%10.10lld]: ", g_time3()); \ + g_write("xrdp-chansrv [%"PRIu64"]: ", g_time3()); \ g_writeln _params ; \ } \ } diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c index 392932f7..852b6f17 100644 --- a/sesman/chansrv/chansrv_fuse.c +++ b/sesman/chansrv/chansrv_fuse.c @@ -132,14 +132,14 @@ void xfuse_devredir_cb_file_close(void *vp) {} #define log_error(_params...) \ { \ - g_write("[%10.10lld]: FUSE %s: %d : ERROR: ", \ + g_write("[%"PRIu64"]: FUSE %s: %d : ERROR: ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } #define log_always(_params...) \ { \ - g_write("[%10.10lld]: FUSE %s: %d : ALWAYS: ",\ + g_write("[%"PRIu64"]: FUSE %s: %d : ALWAYS: ",\ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } @@ -148,7 +148,7 @@ void xfuse_devredir_cb_file_close(void *vp) {} { \ if (LOG_INFO <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: FUSE %s: %d : ", \ + g_write("[%"PRIu64"]: FUSE %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -158,7 +158,7 @@ void xfuse_devredir_cb_file_close(void *vp) {} { \ if (LOG_DEBUG <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: FUSE %s: %d : ", \ + g_write("[%"PRIu64"]: FUSE %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c index e3b5398b..b380dfb1 100644 --- a/sesman/chansrv/clipboard.c +++ b/sesman/chansrv/clipboard.c @@ -186,14 +186,14 @@ x-special/gnome-copied-files #define log_error(_params...) \ { \ - g_write("[%10.10lld]: CLIPBOARD %s: %d : ERROR: ", \ + g_write("[%"PRIu64"]: CLIPBOARD %s: %d : ERROR: ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } #define log_always(_params...) \ { \ - g_write("[%10.10lld]: CLIPBOARD %s: %d : ALWAYS: ",\ + g_write("[%"PRIu64"]: CLIPBOARD %s: %d : ALWAYS: ",\ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } @@ -202,7 +202,7 @@ x-special/gnome-copied-files { \ if (LOG_INFO <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: CLIPBOARD %s: %d : ", \ + g_write("[%"PRIu64"]: CLIPBOARD %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -212,7 +212,7 @@ x-special/gnome-copied-files { \ if (LOG_DEBUG <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: CLIPBOARD %s: %d : ", \ + g_write("[%"PRIu64"]: CLIPBOARD %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ diff --git a/sesman/chansrv/clipboard_file.c b/sesman/chansrv/clipboard_file.c index b80b0887..75b09b61 100644 --- a/sesman/chansrv/clipboard_file.c +++ b/sesman/chansrv/clipboard_file.c @@ -49,14 +49,14 @@ #define log_error(_params...) \ { \ - g_write("[%10.10lld]: CLIPFILE %s: %d : ERROR: ", \ + g_write("[%"PRIu64"]: CLIPFILE %s: %d : ERROR: ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } #define log_always(_params...) \ { \ - g_write("[%10.10lld]: CLIPFILE %s: %d : ALWAYS: ",\ + g_write("[%"PRIu64"]: CLIPFILE %s: %d : ALWAYS: ",\ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } @@ -65,7 +65,7 @@ { \ if (LOG_INFO <= LOG_LVL) \ { \ - g_write("[%10.10lld]: CLIPFILE %s: %d : ", \ + g_write("[%"PRIu64"]: CLIPFILE %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -75,7 +75,7 @@ { \ if (LOG_DEBUG <= LOG_LVL) \ { \ - g_write("[%10.10lld]: CLIPFILE %s: %d : ", \ + g_write("[%"PRIu64"]: CLIPFILE %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ diff --git a/sesman/chansrv/devredir.c b/sesman/chansrv/devredir.c index 0f407822..1e7a5781 100644 --- a/sesman/chansrv/devredir.c +++ b/sesman/chansrv/devredir.c @@ -66,7 +66,7 @@ #define log_error(_params...) \ { \ - g_write("[%10.10lld]: DEV_REDIR %s: %d : ERROR: ", \ + g_write("[%"PRIu64"]: DEV_REDIR %s: %d : ERROR: ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } @@ -75,7 +75,7 @@ { \ if (LOG_INFO <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: DEV_REDIR %s: %d : ", \ + g_write("[%"PRIu64"]: DEV_REDIR %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -85,7 +85,7 @@ { \ if (LOG_DEBUG <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: DEV_REDIR %s: %d : ", \ + g_write("[%"PRIu64"]: DEV_REDIR %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ diff --git a/sesman/chansrv/irp.c b/sesman/chansrv/irp.c index 7861f83d..aef5d5a0 100644 --- a/sesman/chansrv/irp.c +++ b/sesman/chansrv/irp.c @@ -40,7 +40,7 @@ #define log_error(_params...) \ { \ - g_write("[%10.10lld]: IRP %s: %d : ERROR: ", \ + g_write("[%"PRIu64"]: IRP %s: %d : ERROR: ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } @@ -49,7 +49,7 @@ { \ if (LOG_INFO <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: IRP %s: %d : ", \ + g_write("[%"PRIu64"]: IRP %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -59,7 +59,7 @@ { \ if (LOG_DEBUG <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: IRP %s: %d : ", \ + g_write("[%"PRIu64"]: IRP %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ diff --git a/sesman/chansrv/mlog.h b/sesman/chansrv/mlog.h index e5e5a4ca..5637a77d 100644 --- a/sesman/chansrv/mlog.h +++ b/sesman/chansrv/mlog.h @@ -42,7 +42,7 @@ #define log_error(_params...) \ do \ { \ - g_write("[%10.10lld]: %s %s: %d: ERROR: ", g_time3(), \ + g_write("[%"PRIu64"]: %s %s: %d: ERROR: ", g_time3(), \ MODULE_NAME, __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -51,7 +51,7 @@ while(0) #define log_always(_params...) \ do \ { \ - g_write("[%10.10lld]: %s %s: %d: ALWAYS: ", g_time3(), \ + g_write("[%"PRIu64"]: %s %s: %d: ALWAYS: ", g_time3(), \ MODULE_NAME, __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -67,7 +67,7 @@ do \ { \ if (LOG_INFO <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: %s %s: %d: INFO: ", g_time3(), \ + g_write("[%"PRIu64"]: %s %s: %d: INFO: ", g_time3(), \ MODULE_NAME, __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -83,7 +83,7 @@ do \ { \ if (LOG_DEBUG_LOW <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: %s %s: %d: DEBUG: ", g_time3(), \ + g_write("[%"PRIu64"]: %s %s: %d: DEBUG: ", g_time3(), \ MODULE_NAME, __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -99,7 +99,7 @@ do \ { \ if (LOG_DEBUG_HIGH <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: %s %s: %d: DEBUG: ", g_time3(), \ + g_write("[%"PRIu64"]: %s %s: %d: DEBUG: ", g_time3(), \ MODULE_NAME, __func__, __LINE__); \ g_writeln (_params); \ } \ diff --git a/sesman/chansrv/smartcard.c b/sesman/chansrv/smartcard.c index 26cfea0c..442933ed 100644 --- a/sesman/chansrv/smartcard.c +++ b/sesman/chansrv/smartcard.c @@ -70,7 +70,7 @@ #define log_error(_params...) \ do \ { \ - g_write("[%10.10lld]: SMART_CARD %s: %d : ERROR: ", \ + g_write("[%"PRIu64"]: SMART_CARD %s: %d : ERROR: ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } while (0) @@ -80,7 +80,7 @@ do \ { \ if (LOG_INFO <= LOG_LEVEL) \ { \ - g_write("[%10.10lld]: SMART_CARD %s: %d : ", \ + g_write("[%"PRIu64"]: SMART_CARD %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ @@ -92,7 +92,7 @@ do \ if (LOG_DEBUG <= LOG_LEVEL) \ if (2 <= 1) \ { \ - g_write("[%10.10lld]: SMART_CARD %s: %d : ", \ + g_write("[%"PRIu64"]: SMART_CARD %s: %d : ", \ g_time3(), __func__, __LINE__); \ g_writeln (_params); \ } \ diff --git a/sesman/chansrv/smartcard_pcsc.c b/sesman/chansrv/smartcard_pcsc.c index db0f6f3c..4f4fb361 100644 --- a/sesman/chansrv/smartcard_pcsc.c +++ b/sesman/chansrv/smartcard_pcsc.c @@ -49,7 +49,7 @@ { \ if (_level < LLOG_LEVEL) \ { \ - g_write("chansrv:smartcard_pcsc [%10.10lld]: ", g_time3()); \ + g_write("chansrv:smartcard_pcsc [%"PRIu64"]: ", g_time3()); \ g_writeln _args ; \ } \ } \ diff --git a/tests/common/os_calls/g_time.c b/tests/common/os_calls/g_time.c index 83a4f70c..85d3930d 100644 --- a/tests/common/os_calls/g_time.c +++ b/tests/common/os_calls/g_time.c @@ -28,20 +28,20 @@ int main(void) { #if !defined(_WIN32) /* This test is not intended to be run under Win32 */ - long long gTime1, gTime2, gTime3; + uint64_t gTime1, gTime2, gTime3; gTime1 = g_time1(); gTime2 = g_time2(); gTime3 = g_time3(); - printf("g_time1() = %16lld [ sec] (epoch time)\n", - (long long) gTime1); - printf("g_time1() * 1000 = %16lld [msec] (epoch time)\n", - (long long) gTime1 * 1000); - printf("g_time2() = %16lld [msec] (since machine was started)\n", - (long long) gTime2); - printf("g_time3() = %16lld [msec] (epoch time in msec)\n", - (long long) gTime3); + printf("g_time1() = %16"PRIu64" [ sec] (epoch time)\n", + gTime1); + printf("g_time1() * 1000 = %16"PRIu64" [msec] (epoch time)\n", + gTime1 * 1000); + printf("g_time2() = %16"PRIu64" [msec] (since machine was started)\n", + gTime2); + printf("g_time3() = %16"PRIu64" [msec] (epoch time in msec)\n", + gTime3); printf("\n"); printf("Testing...\n"); diff --git a/vnc/vnc.c b/vnc/vnc.c index b24203be..7c90f381 100644 --- a/vnc/vnc.c +++ b/vnc/vnc.c @@ -33,7 +33,7 @@ { \ if (_level < LLOG_LEVEL) \ { \ - g_write("xrdp:vnc [%10.10lld]: ", g_time3()); \ + g_write("xrdp:vnc [%"PRIu64"]: ", g_time3()); \ g_writeln _args ; \ } \ } \ diff --git a/xrdp/xrdp_bitmap.c b/xrdp/xrdp_bitmap.c index c96d980f..ce4b5428 100644 --- a/xrdp/xrdp_bitmap.c +++ b/xrdp/xrdp_bitmap.c @@ -34,7 +34,7 @@ { \ if (_level < LLOG_LEVEL) \ { \ - g_write("xrdp:xrdp_bitmap [%10.10lld]: ", g_time3()); \ + g_write("xrdp:xrdp_bitmap [%"PRIu64"]: ", g_time3()); \ g_writeln _args ; \ } \ } \ diff --git a/xrdp/xrdp_cache.c b/xrdp/xrdp_cache.c index 81d02ad3..a0588ea2 100644 --- a/xrdp/xrdp_cache.c +++ b/xrdp/xrdp_cache.c @@ -31,7 +31,7 @@ { \ if (_level < LLOG_LEVEL) \ { \ - g_write("xrdp:xrdp_cache [%10.10lld]: ", g_time3()); \ + g_write("xrdp:xrdp_cache [%"PRIu64"]: ", g_time3()); \ g_writeln _args ; \ } \ } \ diff --git a/xrdp/xrdp_encoder.c b/xrdp/xrdp_encoder.c index ef9543c2..ed5f8abf 100644 --- a/xrdp/xrdp_encoder.c +++ b/xrdp/xrdp_encoder.c @@ -37,7 +37,7 @@ { \ if (_level < LLOG_LEVEL) \ { \ - g_write("xrdp:xrdp_encoder [%10.10lld]: ", g_time3()); \ + g_write("xrdp:xrdp_encoder [%"PRIu64"]: ", g_time3()); \ g_writeln _args ; \ } \ } \ diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index 101c9ade..3318a8e4 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -43,7 +43,7 @@ { \ if (_level < LLOG_LEVEL) \ { \ - g_write("xrdp:xrdp_mm [%10.10lld]: ", g_time3()); \ + g_write("xrdp:xrdp_mm [%"PRIu64"]: ", g_time3()); \ g_writeln _args ; \ } \ } \ diff --git a/xrdp/xrdp_painter.c b/xrdp/xrdp_painter.c index e7cb008a..3eb3f707 100644 --- a/xrdp/xrdp_painter.c +++ b/xrdp/xrdp_painter.c @@ -34,7 +34,7 @@ { \ if (_level < LLOG_LEVEL) \ { \ - g_write("xrdp:xrdp_painter [%10.10lld]: ", g_time3()); \ + g_write("xrdp:xrdp_painter [%"PRIu64"]: ", g_time3()); \ g_writeln _args ; \ } \ } \