jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use PRIu64 to format uint64_t

Browse Source
This commit is contained in:
Koichiro IWAO 2018-04-16 00:45:09 +09:00
parent e97b9352f4
commit e525cc55d4
No known key found for this signature in database
GPG Key ID: 9F72CDBC01BF10EB
18 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/arch.h
View File

@ -43,6 +43,9 @@ typedef unsigned long uintptr_t;
#endif
#endif
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
typedef int bool_t;
/* you can define L_ENDIAN or B_ENDIAN and NEED_ALIGN or NO_NEED_ALIGN

2
libxrdp/xrdp_orders.c
View File

@ -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 ; \
} \
}

2
sesman/chansrv/chansrv.h
View File

@ -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 ; \
} \
}

8
sesman/chansrv/chansrv_fuse.c
View File

@ -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); \
} \

8
sesman/chansrv/clipboard.c
View File

@ -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); \
} \

8
sesman/chansrv/clipboard_file.c
View File

@ -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); \
} \

6
sesman/chansrv/devredir.c
View File

@ -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); \
} \

6
sesman/chansrv/irp.c
View File

@ -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); \
} \

10
sesman/chansrv/mlog.h
View File

@ -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); \
} \

6
sesman/chansrv/smartcard.c
View File

@ -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); \
} \

2
sesman/chansrv/smartcard_pcsc.c
View File

@ -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 ; \
} \
} \

18
tests/common/os_calls/g_time.c
View File

@ -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");

2
vnc/vnc.c
View File

@ -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 ; \
} \
} \

2
xrdp/xrdp_bitmap.c
View File

@ -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 ; \
} \
} \

2
xrdp/xrdp_cache.c
View File

@ -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 ; \
} \
} \

2
xrdp/xrdp_encoder.c
View File

@ -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 ; \
} \
} \

2
xrdp/xrdp_mm.c
View File

@ -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 ; \
} \
} \

2
xrdp/xrdp_painter.c
View File

@ -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 ; \
} \
} \