diff options
| -rw-r--r-- | src/common/util.c | 4 | ||||
| -rw-r--r-- | src/or/connection_or.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/util.c b/src/common/util.c index 79bc57782..5f7a6017d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -82,7 +82,7 @@ tv_udiff(struct timeval *start, struct timeval *end) udiff = secdiff*1000000L + (end->tv_usec - start->tv_usec); if(udiff < 0) { log_fn(LOG_INFO, "start (%ld.%ld) is after end (%ld.%ld). Returning 0.", - start->tv_sec, start->tv_usec, end->tv_sec, end->tv_usec); + (long)start->tv_sec, (long)start->tv_usec, (long)end->tv_sec, (long)end->tv_usec); return 0; } return udiff; @@ -215,7 +215,7 @@ tor_socketpair(int family, int type, int protocol, int fd[2]) int acceptor = -1; struct sockaddr_in listen_addr; struct sockaddr_in connect_addr; - size_t size; + int size; if (protocol #ifdef AF_UNIX diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 3af6cc5b5..d3fd118e0 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -270,7 +270,7 @@ static int connection_or_process_cell_from_inbuf(connection_t *conn) { cell_t cell; log_fn(LOG_DEBUG,"%d: starting, inbuf_datalen %d (%d pending in tls object).", - conn->s,buf_datalen(conn->inbuf),tor_tls_get_pending_bytes(conn->tls)); + conn->s,(int)buf_datalen(conn->inbuf),tor_tls_get_pending_bytes(conn->tls)); if(buf_datalen(conn->inbuf) < CELL_NETWORK_SIZE) /* entire response available? */ return 0; /* not yet */ |