Browse Source

Build without warnings on OS X.

svn:r595
Nick Mathewson 20 years ago
parent
commit
695920d09f
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/common/util.c
  2. 1 1
      src/or/connection_or.c

+ 2 - 2
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

+ 1 - 1
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 */