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

Sticking a size_t into long generates a warn on win

Browse Source
This commit is contained in:
Sebastian Hahn 2011-08-09 11:34:21 +02:00
parent bed79c47f4
commit 7c340a97b1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/connection_edge.c
View File

@ -161,7 +161,8 @@ connection_edge_process_inbuf(edge_connection_t *conn, int package_partial)
"data from edge while in '%s' state. Sending it anyway. " "data from edge while in '%s' state. Sending it anyway. "
"package_partial=%d, buflen=%ld", "package_partial=%d, buflen=%ld",
conn_state_to_string(conn->_base.type, conn->_base.state), conn_state_to_string(conn->_base.type, conn->_base.state),
package_partial, connection_get_inbuf_len(TO_CONN(conn))); package_partial,
(long)connection_get_inbuf_len(TO_CONN(conn)));
if (connection_edge_package_raw_inbuf(conn, package_partial, NULL)<0) { if (connection_edge_package_raw_inbuf(conn, package_partial, NULL)<0) {
/* (We already sent an end cell if possible) */ /* (We already sent an end cell if possible) */
connection_mark_for_close(TO_CONN(conn)); connection_mark_for_close(TO_CONN(conn));
@ -2442,9 +2443,10 @@ connection_ap_handshake_send_begin(edge_connection_t *ap_conn)
ap_conn->sending_optimistic_data) && ap_conn->sending_optimistic_data) &&
connection_ap_supports_optimistic_data(ap_conn)) { connection_ap_supports_optimistic_data(ap_conn)) {
log_info(LD_APP, "Sending up to %ld + %ld bytes of queued-up data", log_info(LD_APP, "Sending up to %ld + %ld bytes of queued-up data",
connection_get_inbuf_len(TO_CONN(ap_conn)), (long)connection_get_inbuf_len(TO_CONN(ap_conn)),
ap_conn->sending_optimistic_data ? ap_conn->sending_optimistic_data ?
generic_buffer_len(ap_conn->sending_optimistic_data) : 0); (long)generic_buffer_len(ap_conn->sending_optimistic_data) :
0);
if (connection_edge_package_raw_inbuf(ap_conn, 1, NULL) < 0) { if (connection_edge_package_raw_inbuf(ap_conn, 1, NULL) < 0) {
connection_mark_for_close(TO_CONN(ap_conn)); connection_mark_for_close(TO_CONN(ap_conn));
} }