diff options
| author | Nick Mathewson <nickm@torproject.org> | 2003-12-16 05:33:11 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2003-12-16 05:33:11 +0000 |
| commit | 7c439c30d00e4851458b66c25a848e27d30c7abe (patch) | |
| tree | 2332de0114985ff595f7d0e561185ecbc2a314e0 /src/or | |
| parent | eeae6157ed824dd59c5474b522e1703cb86c230b (diff) | |
| download | tor-7c439c30d00e4851458b66c25a848e27d30c7abe.tar.gz tor-7c439c30d00e4851458b66c25a848e27d30c7abe.zip | |
Resolve format warnings on MacOS X 10.3
svn:r938
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/buffers.c | 7 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 4 | ||||
| -rw-r--r-- | src/or/directory.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index d8a0e52583..016e10a5db 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -291,7 +291,7 @@ int write_to_buf(const char *string, int string_len, buf_t *buf) { assert(string && BUF_OK(buf)); if (buf_ensure_capacity(buf, buf->datalen+string_len)) { - log_fn(LOG_WARN, "buflen too small, can't hold %d bytes.",buf->datalen+string_len); + log_fn(LOG_WARN, "buflen too small, can't hold %d bytes.", (int)buf->datalen+string_len); return -1; } @@ -453,7 +453,7 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req) { tmpbuf = inet_ntoa(in); if(strlen(tmpbuf)+1 > MAX_SOCKS_ADDR_LEN) { log_fn(LOG_WARN,"socks5 IP takes %d bytes, which doesn't fit in %d", - strlen(tmpbuf)+1,MAX_SOCKS_ADDR_LEN); + (int)strlen(tmpbuf)+1,(int)MAX_SOCKS_ADDR_LEN); return -1; } strcpy(req->address,tmpbuf); @@ -502,7 +502,8 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req) { in.s_addr = htonl(destip); tmpbuf = inet_ntoa(in); if(strlen(tmpbuf)+1 > MAX_SOCKS_ADDR_LEN) { - log_fn(LOG_WARN,"socks4 addr (%d bytes) too long.", strlen(tmpbuf)); + log_fn(LOG_WARN,"socks4 addr (%d bytes) too long.", + (int)strlen(tmpbuf)); return -1; } log_fn(LOG_DEBUG,"socks4: successfully read destip (%s)", tmpbuf); diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 650023a3a0..32b7c688bc 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -893,8 +893,8 @@ static uint32_t client_dns_lookup_entry(const char *address) assert(address); if (inet_aton(address, &in)) { - log_fn(LOG_DEBUG, "Using static address %s (%08lX)", address, - ntohl(in.s_addr)); + log_fn(LOG_DEBUG, "Using static address %s (%08lX)", address, + (unsigned long)ntohl(in.s_addr)); return ntohl(in.s_addr); } search.address = (char*)address; diff --git a/src/or/directory.c b/src/or/directory.c index 78e6d4a9f8..30da4dc666 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -85,7 +85,7 @@ static int directory_send_command(connection_t *conn, int command) { return -1; } snprintf(tmp, sizeof(tmp), "POST / HTTP/1.0\r\nContent-Length: %d\r\n\r\n%s", - strlen(s), s); + (int)strlen(s), s); connection_write_to_buf(tmp, strlen(tmp), conn); conn->state = DIR_CONN_STATE_CLIENT_SENDING_UPLOAD; break; |