Skip to content

Commit e525cc5

Browse files
metaleftymetalefty
committed
use PRIu64 to format uint64_t
1 parent e97b935 commit e525cc5

File tree

18 files changed

+47
-44
lines changed

18 files changed

+47
-44
lines changed

‎common/arch.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ typedef unsigned long uintptr_t;
4343
#endif
4444
#endif
4545

46+
#define __STDC_FORMAT_MACROS
47+
#include <inttypes.h>
48+
4649
typedef int bool_t;
4750

4851
/* you can define L_ENDIAN or B_ENDIAN and NEED_ALIGN or NO_NEED_ALIGN

‎libxrdp/xrdp_orders.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
{ \
3434
if (_log_level < LLOG_LEVEL) \
3535
{ \
36-
g_write("xrdp_orders.c [%10.10lld]: ", g_time3()); \
36+
g_write("xrdp_orders.c [%"PRIu64"]: ", g_time3()); \
3737
g_writeln _params ; \
3838
} \
3939
}

‎sesman/chansrv/chansrv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int remove_struct_with_chan_id(tui32 dvc_chan_id);
7171
{ \
7272
if (_a < LOG_LEVEL) \
7373
{ \
74-
g_write("xrdp-chansrv [%10.10lld]: ", g_time3()); \
74+
g_write("xrdp-chansrv [%"PRIu64"]: ", g_time3()); \
7575
g_writeln _params ; \
7676
} \
7777
}

‎sesman/chansrv/chansrv_fuse.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,14 @@ void xfuse_devredir_cb_file_close(void *vp) {}
132132

133133
#define log_error(_params...) \
134134
{ \
135-
g_write("[%10.10lld]: FUSE %s: %d : ERROR: ", \
135+
g_write("[%"PRIu64"]: FUSE %s: %d : ERROR: ", \
136136
g_time3(), __func__, __LINE__); \
137137
g_writeln (_params); \
138138
}
139139

140140
#define log_always(_params...) \
141141
{ \
142-
g_write("[%10.10lld]: FUSE %s: %d : ALWAYS: ",\
142+
g_write("[%"PRIu64"]: FUSE %s: %d : ALWAYS: ",\
143143
g_time3(), __func__, __LINE__); \
144144
g_writeln (_params); \
145145
}
@@ -148,7 +148,7 @@ void xfuse_devredir_cb_file_close(void *vp) {}
148148
{ \
149149
if (LOG_INFO <= LOG_LEVEL) \
150150
{ \
151-
g_write("[%10.10lld]: FUSE %s: %d : ", \
151+
g_write("[%"PRIu64"]: FUSE %s: %d : ", \
152152
g_time3(), __func__, __LINE__); \
153153
g_writeln (_params); \
154154
} \
@@ -158,7 +158,7 @@ void xfuse_devredir_cb_file_close(void *vp) {}
158158
{ \
159159
if (LOG_DEBUG <= LOG_LEVEL) \
160160
{ \
161-
g_write("[%10.10lld]: FUSE %s: %d : ", \
161+
g_write("[%"PRIu64"]: FUSE %s: %d : ", \
162162
g_time3(), __func__, __LINE__); \
163163
g_writeln (_params); \
164164
} \

‎sesman/chansrv/clipboard.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,14 @@ x-special/gnome-copied-files
186186

187187
#define log_error(_params...) \
188188
{ \
189-
g_write("[%10.10lld]: CLIPBOARD %s: %d : ERROR: ", \
189+
g_write("[%"PRIu64"]: CLIPBOARD %s: %d : ERROR: ", \
190190
g_time3(), __func__, __LINE__); \
191191
g_writeln (_params); \
192192
}
193193

194194
#define log_always(_params...) \
195195
{ \
196-
g_write("[%10.10lld]: CLIPBOARD %s: %d : ALWAYS: ",\
196+
g_write("[%"PRIu64"]: CLIPBOARD %s: %d : ALWAYS: ",\
197197
g_time3(), __func__, __LINE__); \
198198
g_writeln (_params); \
199199
}
@@ -202,7 +202,7 @@ x-special/gnome-copied-files
202202
{ \
203203
if (LOG_INFO <= LOG_LEVEL) \
204204
{ \
205-
g_write("[%10.10lld]: CLIPBOARD %s: %d : ", \
205+
g_write("[%"PRIu64"]: CLIPBOARD %s: %d : ", \
206206
g_time3(), __func__, __LINE__); \
207207
g_writeln (_params); \
208208
} \
@@ -212,7 +212,7 @@ x-special/gnome-copied-files
212212
{ \
213213
if (LOG_DEBUG <= LOG_LEVEL) \
214214
{ \
215-
g_write("[%10.10lld]: CLIPBOARD %s: %d : ", \
215+
g_write("[%"PRIu64"]: CLIPBOARD %s: %d : ", \
216216
g_time3(), __func__, __LINE__); \
217217
g_writeln (_params); \
218218
} \

‎sesman/chansrv/clipboard_file.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@
4949

5050
#define log_error(_params...) \
5151
{ \
52-
g_write("[%10.10lld]: CLIPFILE %s: %d : ERROR: ", \
52+
g_write("[%"PRIu64"]: CLIPFILE %s: %d : ERROR: ", \
5353
g_time3(), __func__, __LINE__); \
5454
g_writeln (_params); \
5555
}
5656

5757
#define log_always(_params...) \
5858
{ \
59-
g_write("[%10.10lld]: CLIPFILE %s: %d : ALWAYS: ",\
59+
g_write("[%"PRIu64"]: CLIPFILE %s: %d : ALWAYS: ",\
6060
g_time3(), __func__, __LINE__); \
6161
g_writeln (_params); \
6262
}
@@ -65,7 +65,7 @@
6565
{ \
6666
if (LOG_INFO <= LOG_LVL) \
6767
{ \
68-
g_write("[%10.10lld]: CLIPFILE %s: %d : ", \
68+
g_write("[%"PRIu64"]: CLIPFILE %s: %d : ", \
6969
g_time3(), __func__, __LINE__); \
7070
g_writeln (_params); \
7171
} \
@@ -75,7 +75,7 @@
7575
{ \
7676
if (LOG_DEBUG <= LOG_LVL) \
7777
{ \
78-
g_write("[%10.10lld]: CLIPFILE %s: %d : ", \
78+
g_write("[%"PRIu64"]: CLIPFILE %s: %d : ", \
7979
g_time3(), __func__, __LINE__); \
8080
g_writeln (_params); \
8181
} \

‎sesman/chansrv/devredir.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
#define log_error(_params...) \
6868
{ \
69-
g_write("[%10.10lld]: DEV_REDIR %s: %d : ERROR: ", \
69+
g_write("[%"PRIu64"]: DEV_REDIR %s: %d : ERROR: ", \
7070
g_time3(), __func__, __LINE__); \
7171
g_writeln (_params); \
7272
}
@@ -75,7 +75,7 @@
7575
{ \
7676
if (LOG_INFO <= LOG_LEVEL) \
7777
{ \
78-
g_write("[%10.10lld]: DEV_REDIR %s: %d : ", \
78+
g_write("[%"PRIu64"]: DEV_REDIR %s: %d : ", \
7979
g_time3(), __func__, __LINE__); \
8080
g_writeln (_params); \
8181
} \
@@ -85,7 +85,7 @@
8585
{ \
8686
if (LOG_DEBUG <= LOG_LEVEL) \
8787
{ \
88-
g_write("[%10.10lld]: DEV_REDIR %s: %d : ", \
88+
g_write("[%"PRIu64"]: DEV_REDIR %s: %d : ", \
8989
g_time3(), __func__, __LINE__); \
9090
g_writeln (_params); \
9191
} \

‎sesman/chansrv/irp.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
#define log_error(_params...) \
4242
{ \
43-
g_write("[%10.10lld]: IRP %s: %d : ERROR: ", \
43+
g_write("[%"PRIu64"]: IRP %s: %d : ERROR: ", \
4444
g_time3(), __func__, __LINE__); \
4545
g_writeln (_params); \
4646
}
@@ -49,7 +49,7 @@
4949
{ \
5050
if (LOG_INFO <= LOG_LEVEL) \
5151
{ \
52-
g_write("[%10.10lld]: IRP %s: %d : ", \
52+
g_write("[%"PRIu64"]: IRP %s: %d : ", \
5353
g_time3(), __func__, __LINE__); \
5454
g_writeln (_params); \
5555
} \
@@ -59,7 +59,7 @@
5959
{ \
6060
if (LOG_DEBUG <= LOG_LEVEL) \
6161
{ \
62-
g_write("[%10.10lld]: IRP %s: %d : ", \
62+
g_write("[%"PRIu64"]: IRP %s: %d : ", \
6363
g_time3(), __func__, __LINE__); \
6464
g_writeln (_params); \
6565
} \

‎sesman/chansrv/mlog.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#define log_error(_params...) \
4343
do \
4444
{ \
45-
g_write("[%10.10lld]: %s %s: %d: ERROR: ", g_time3(), \
45+
g_write("[%"PRIu64"]: %s %s: %d: ERROR: ", g_time3(), \
4646
MODULE_NAME, __func__, __LINE__); \
4747
g_writeln (_params); \
4848
} \
@@ -51,7 +51,7 @@ while(0)
5151
#define log_always(_params...) \
5252
do \
5353
{ \
54-
g_write("[%10.10lld]: %s %s: %d: ALWAYS: ", g_time3(), \
54+
g_write("[%"PRIu64"]: %s %s: %d: ALWAYS: ", g_time3(), \
5555
MODULE_NAME, __func__, __LINE__); \
5656
g_writeln (_params); \
5757
} \
@@ -67,7 +67,7 @@ do \
6767
{ \
6868
if (LOG_INFO <= LOG_LEVEL) \
6969
{ \
70-
g_write("[%10.10lld]: %s %s: %d: INFO: ", g_time3(), \
70+
g_write("[%"PRIu64"]: %s %s: %d: INFO: ", g_time3(), \
7171
MODULE_NAME, __func__, __LINE__); \
7272
g_writeln (_params); \
7373
} \
@@ -83,7 +83,7 @@ do \
8383
{ \
8484
if (LOG_DEBUG_LOW <= LOG_LEVEL) \
8585
{ \
86-
g_write("[%10.10lld]: %s %s: %d: DEBUG: ", g_time3(), \
86+
g_write("[%"PRIu64"]: %s %s: %d: DEBUG: ", g_time3(), \
8787
MODULE_NAME, __func__, __LINE__); \
8888
g_writeln (_params); \
8989
} \
@@ -99,7 +99,7 @@ do \
9999
{ \
100100
if (LOG_DEBUG_HIGH <= LOG_LEVEL) \
101101
{ \
102-
g_write("[%10.10lld]: %s %s: %d: DEBUG: ", g_time3(), \
102+
g_write("[%"PRIu64"]: %s %s: %d: DEBUG: ", g_time3(), \
103103
MODULE_NAME, __func__, __LINE__); \
104104
g_writeln (_params); \
105105
} \

‎sesman/chansrv/smartcard.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
#define log_error(_params...) \
7171
do \
7272
{ \
73-
g_write("[%10.10lld]: SMART_CARD %s: %d : ERROR: ", \
73+
g_write("[%"PRIu64"]: SMART_CARD %s: %d : ERROR: ", \
7474
g_time3(), __func__, __LINE__); \
7575
g_writeln (_params); \
7676
} while (0)
@@ -80,7 +80,7 @@ do \
8080
{ \
8181
if (LOG_INFO <= LOG_LEVEL) \
8282
{ \
83-
g_write("[%10.10lld]: SMART_CARD %s: %d : ", \
83+
g_write("[%"PRIu64"]: SMART_CARD %s: %d : ", \
8484
g_time3(), __func__, __LINE__); \
8585
g_writeln (_params); \
8686
} \
@@ -92,7 +92,7 @@ do \
9292
if (LOG_DEBUG <= LOG_LEVEL) \
9393
if (2 <= 1) \
9494
{ \
95-
g_write("[%10.10lld]: SMART_CARD %s: %d : ", \
95+
g_write("[%"PRIu64"]: SMART_CARD %s: %d : ", \
9696
g_time3(), __func__, __LINE__); \
9797
g_writeln (_params); \
9898
} \

0 commit comments

Comments
 (0)