aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-08-09 11:34:21 +0200
committerSebastian Hahn <sebastian@torproject.org>2011-08-09 11:34:21 +0200
commit7c340a97b1252e1165dc646d4e75ce4d837c65e6 (patch)
treed150df8af70ed30a8644994ce97e7386a4cefc08 /src/or/connection_edge.c
parentbed79c47f4ec0ee72b19e2b81c54131d516d07ef (diff)
downloadtor-7c340a97b1252e1165dc646d4e75ce4d837c65e6.tar
tor-7c340a97b1252e1165dc646d4e75ce4d837c65e6.tar.gz
Sticking a size_t into long generates a warn on win
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 7dd6ee05e..72c42249d 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -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. "
"package_partial=%d, buflen=%ld",
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) {
/* (We already sent an end cell if possible) */
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) &&
connection_ap_supports_optimistic_data(ap_conn)) {
log_info(LD_APP, "Sending up to %ld + %ld bytes of queued-up data",
- connection_get_inbuf_len(TO_CONN(ap_conn)),
- ap_conn->sending_optimistic_data ?
- generic_buffer_len(ap_conn->sending_optimistic_data) : 0);
+ (long)connection_get_inbuf_len(TO_CONN(ap_conn)),
+ ap_conn->sending_optimistic_data ?
+ (long)generic_buffer_len(ap_conn->sending_optimistic_data) :
+ 0);
if (connection_edge_package_raw_inbuf(ap_conn, 1, NULL) < 0) {
connection_mark_for_close(TO_CONN(ap_conn));
}