nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.4' into additional_rust_test_fixes

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-20 17:53:51 -04:00
commit 3b606ff787
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/util.c
View File

@ -4801,8 +4801,8 @@ process_environment_t *
process_environment_make(struct smartlist_t *env_vars)
{
process_environment_t *env = tor_malloc_zero(sizeof(process_environment_t));
size_t n_env_vars = smartlist_len(env_vars);
size_t i;
int n_env_vars = smartlist_len(env_vars);
int i;
size_t total_env_length;
smartlist_t *env_vars_sorted;
@ -5375,4 +5375,3 @@ tor_ntohll(uint64_t a)
{
return tor_htonll(a);
}

5
src/or/control.c
View File

@ -4597,7 +4597,7 @@ handle_control_add_onion(control_connection_t *conn,
const char *body)
{
smartlist_t *args;
size_t arg_len;
int arg_len;
(void) len; /* body is nul-terminated; it's safe to ignore the length */
args = getargs_helper("ADD_ONION", conn, body, 2, -1);
if (!args)
@ -4618,7 +4618,7 @@ handle_control_add_onion(control_connection_t *conn,
rend_auth_type_t auth_type = REND_NO_AUTH;
/* Default to adding an anonymous hidden service if no flag is given */
int non_anonymous = 0;
for (size_t i = 1; i < arg_len; i++) {
for (int i = 1; i < arg_len; i++) {
static const char *port_prefix = "Port=";
static const char *flags_prefix = "Flags=";
static const char *max_s_prefix = "MaxStreams=";
@ -7736,4 +7736,3 @@ control_testing_set_global_event_mask(uint64_t mask)
global_event_mask = mask;
}
#endif /* defined(TOR_UNIT_TESTS) */

3
src/or/geoip.c
View File

@ -150,7 +150,7 @@ geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high,
idx = ((uintptr_t)idxplus1_)-1;
}
{
geoip_country_t *c = smartlist_get(geoip_countries, idx);
geoip_country_t *c = smartlist_get(geoip_countries, (int)idx);
tor_assert(!strcasecmp(c->countrycode, country));
}
@ -1884,4 +1884,3 @@ geoip_free_all(void)
memset(geoip_digest, 0, sizeof(geoip_digest));
memset(geoip6_digest, 0, sizeof(geoip6_digest));
}