summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-03 12:52:43 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-03 12:52:43 -0400
commitdf98582851a92d514c04061a5e0ec762c17a0cfb (patch)
treeb52518169d65be6773a5abb606f3f56b5b8c9d25 /src/or/directory.c
parentfe8f7748202816a9b90e04db542e449145283a66 (diff)
parent02a4442524d84ea7edf6e3f136017faa73452d92 (diff)
downloadtor-df98582851a92d514c04061a5e0ec762c17a0cfb.tar.gz
tor-df98582851a92d514c04061a5e0ec762c17a0cfb.zip
Merge remote-tracking branch 'github/ticket26626'
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index ca925ed857..8f2bd8d3a7 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1941,12 +1941,12 @@ directory_send_command(dir_connection_t *conn,
log_debug(LD_DIR,
"Sent request to directory server '%s:%d': "
- "(purpose: %d, request size: " U64_FORMAT ", "
- "payload size: " U64_FORMAT ")",
+ "(purpose: %d, request size: %"TOR_PRIuSZ", "
+ "payload size: %"TOR_PRIuSZ")",
conn->base_.address, conn->base_.port,
conn->base_.purpose,
- U64_PRINTF_ARG(total_request_len),
- U64_PRINTF_ARG(payload ? payload_len : 0));
+ (total_request_len),
+ (payload ? payload_len : 0));
}
/** Parse an HTTP request string <b>headers</b> of the form
@@ -2432,14 +2432,14 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
tor_log(LOG_DEBUG, LD_DIR,
"Received response from directory server '%s:%d': %d %s "
- "(purpose: %d, response size: " U64_FORMAT
+ "(purpose: %d, response size: %"TOR_PRIuSZ
#ifdef MEASUREMENTS_21206
", data cells received: %d, data cells sent: %d"
#endif
", compression: %d)",
conn->base_.address, conn->base_.port, status_code,
escaped(reason), conn->base_.purpose,
- U64_PRINTF_ARG(received_bytes),
+ (received_bytes),
#ifdef MEASUREMENTS_21206
conn->data_cells_received, conn->data_cells_sent,
#endif