mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Resolve format warnings on MacOS X 10.3
svn:r938
This commit is contained in:
parent
eeae6157ed
commit
7c439c30d0
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user