diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-03 10:40:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-03 10:40:59 -0400 |
| commit | 9568c0ce3d3885a41ca44ac030b04d089ac56a40 (patch) | |
| tree | 1517c61a9f45ded3fc961231d517c02dc94a5860 /src/or/circuituse.c | |
| parent | 52884f56d43670f1960d9354ccc3ace9a048e283 (diff) | |
| download | tor-9568c0ce3d3885a41ca44ac030b04d089ac56a40.tar.gz tor-9568c0ce3d3885a41ca44ac030b04d089ac56a40.zip | |
Return U64_PRINTF_ARG and U64_FORMAT
The standard is printf("%"PRIu64, x);
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 71abd5d6ce..a3a69dc354 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -719,9 +719,8 @@ circuit_expire_building(void) circuit_build_times_enough_to_compute(get_circuit_build_times())) { log_info(LD_CIRC, - "Deciding to count the timeout for circuit "U64_FORMAT"\n", - U64_PRINTF_ARG( - TO_ORIGIN_CIRCUIT(victim)->global_identifier)); + "Deciding to count the timeout for circuit %"PRIu32"\n", + TO_ORIGIN_CIRCUIT(victim)->global_identifier); /* Circuits are allowed to last longer for measurement. * Switch their purpose and wait. */ @@ -1510,10 +1509,10 @@ circuit_expire_old_circuits_clientside(void) circ->purpose <= CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) || circ->purpose == CIRCUIT_PURPOSE_S_CONNECT_REND) { log_info(LD_CIRC, - "Closing circuit "U64_FORMAT + "Closing circuit %"PRIu32 " that has been unused for %ld msec.", - U64_PRINTF_ARG(TO_ORIGIN_CIRCUIT(circ)->global_identifier), - tv_mdiff(&circ->timestamp_began, &now)); + TO_ORIGIN_CIRCUIT(circ)->global_identifier, + tv_mdiff(&circ->timestamp_began, &now)); circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) { /* Server-side rend joined circuits can end up really old, because |