Commit 6874c399 authored by Nick Mathewson's avatar Nick Mathewson
Browse files

Fix windows build


svn:r2613
parent c5eb95b6
......@@ -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:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment