mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Fix windows build
svn:r2613
This commit is contained in:
parent
c5eb95b644
commit
6874c39904
@ -2346,7 +2346,7 @@ int tor_vsnprintf(char *str, size_t size, const char *format, va_list args)
|
||||
r = vsnprintf(str, size, format, args);
|
||||
#endif
|
||||
str[size-1] = '\0';
|
||||
if (r < 0 || r >= size)
|
||||
if (r < 0 || ((size_t)r) >= size)
|
||||
return -1;
|
||||
return r;
|
||||
}
|
||||
|
@ -309,7 +309,7 @@ config_assign_line(or_options_t *options, struct config_line_t *c)
|
||||
c->key = tor_strdup(var->name);
|
||||
}
|
||||
|
||||
lvalue = ((void*)options) + var->var_offset;
|
||||
lvalue = ((char*)options) + var->var_offset;
|
||||
switch(var->type) {
|
||||
|
||||
case CONFIG_TYPE_UINT:
|
||||
|
@ -511,8 +511,9 @@ list_server_status(char **running_routers_out, char **router_status_out)
|
||||
SMARTLIST_FOREACH(descriptor_list, descriptor_entry_t *, d,
|
||||
{
|
||||
int is_live;
|
||||
connection_t *conn;
|
||||
tor_assert(d->router);
|
||||
connection_t *conn = connection_get_by_identity_digest(
|
||||
conn = connection_get_by_identity_digest(
|
||||
d->router->identity_digest, CONN_TYPE_OR);
|
||||
is_live = (conn && conn->state == OR_CONN_STATE_OPEN);
|
||||
smartlist_add(rr_entries, list_single_server_status(d, is_live, 1));
|
||||
|
@ -159,7 +159,7 @@ static void send_resolved_cell(connection_t *conn, uint8_t answer_type)
|
||||
case RESOLVED_TYPE_ERROR_TRANSIENT:
|
||||
case RESOLVED_TYPE_ERROR:
|
||||
buf[1] = 24; /* length of "error resolving hostname" */
|
||||
strlcpy(buf+2, "error resolving hostname", buf-2);
|
||||
strlcpy(buf+2, "error resolving hostname", sizeof(buf)-2);
|
||||
buflen = 26;
|
||||
break;
|
||||
default:
|
||||
|
Loading…
Reference in New Issue
Block a user