nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile warnings wrt printf formating of int64_t

Browse Source
This commit is contained in:
Nick Mathewson 2013-06-13 10:30:34 -04:00
parent 9b754d1213
commit e61df2ec65
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/or/circuitmux.c
View File

@ -539,14 +539,17 @@ circuitmux_free(circuitmux_t *cmux)
global_destroy_ctr -= cmux->destroy_cell_queue.n; global_destroy_ctr -= cmux->destroy_cell_queue.n;
log_debug(LD_CIRC, log_debug(LD_CIRC,
"Freeing cmux at %p with %u queued destroys; the last cmux " "Freeing cmux at %p with %u queued destroys; the last cmux "
"destroy balance was %ld, global is %ld\n", "destroy balance was "I64_FORMAT", global is "I64_FORMAT,
cmux, cmux->destroy_cell_queue.n, cmux, cmux->destroy_cell_queue.n,
cmux->destroy_ctr, global_destroy_ctr); I64_PRINTF_ARG(cmux->destroy_ctr),
I64_PRINTF_ARG(global_destroy_ctr));
} else { } else {
log_debug(LD_CIRC, log_debug(LD_CIRC,
"Freeing cmux at %p with no queued destroys, the cmux destroy " "Freeing cmux at %p with no queued destroys, the cmux destroy "
"balance was %ld, global is %ld\n", "balance was "I64_FORMAT", global is "I64_FORMAT,
cmux, cmux->destroy_ctr, global_destroy_ctr); cmux,
I64_PRINTF_ARG(cmux->destroy_ctr),
I64_PRINTF_ARG(global_destroy_ctr));
} }
cell_queue_clear(&cmux->destroy_cell_queue); cell_queue_clear(&cmux->destroy_cell_queue);
@ -1543,9 +1546,11 @@ circuitmux_notify_xmit_destroy(circuitmux_t *cmux)
--(cmux->destroy_ctr); --(cmux->destroy_ctr);
--(global_destroy_ctr); --(global_destroy_ctr);
log_debug(LD_CIRC, log_debug(LD_CIRC,
"Cmux at %p sent a destroy, cmux counter is now %ld, " "Cmux at %p sent a destroy, cmux counter is now "I64_FORMAT", "
"global counter is now %ld\n", "global counter is now "I64_FORMAT,
cmux, cmux->destroy_ctr, global_destroy_ctr); cmux,
I64_PRINTF_ARG(cmux->destroy_ctr),
I64_PRINTF_ARG(global_destroy_ctr));
} }
/* /*
@ -1848,9 +1853,11 @@ circuitmux_append_destroy_cell(channel_t *chan,
++(cmux->destroy_ctr); ++(cmux->destroy_ctr);
++global_destroy_ctr; ++global_destroy_ctr;
log_debug(LD_CIRC, log_debug(LD_CIRC,
"Cmux at %p queued a destroy for circ %u, " "Cmux at %p queued a destroy for circ %u, cmux counter is now "
"cmux counter is now %ld, global counter is now %ld\n", I64_FORMAT", global counter is now "I64_FORMAT,
cmux, circ_id, cmux->destroy_ctr, global_destroy_ctr); cmux, circ_id,
I64_PRINTF_ARG(cmux->destroy_ctr),
I64_PRINTF_ARG(global_destroy_ctr));
/* XXXX Duplicate code from append_cell_to_circuit_queue */ /* XXXX Duplicate code from append_cell_to_circuit_queue */
if (!channel_has_queued_writes(chan)) { if (!channel_has_queued_writes(chan)) {