diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-20 17:49:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-20 17:49:56 -0400 |
| commit | f24797a5870b685af98728002a0b0da73f582fda (patch) | |
| tree | 1219499da10d023c02cadc5069317a2e3721e27b | |
| parent | 398f15bdf174c8b480b2d8984562f8360cbd2dda (diff) | |
| parent | f91ea506f0a9af55a520dab4c88abf0c01bd2ce1 (diff) | |
| download | tor-f24797a5870b685af98728002a0b0da73f582fda.tar.gz tor-f24797a5870b685af98728002a0b0da73f582fda.zip | |
Merge branch 'maint-0.3.4'
| -rw-r--r-- | src/common/util.c | 4 | ||||
| -rw-r--r-- | src/or/control.c | 5 | ||||
| -rw-r--r-- | src/or/geoip.c | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/common/util.c b/src/common/util.c index 4fd07fabc5..f6598c58ba 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4678,8 +4678,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; diff --git a/src/or/control.c b/src/or/control.c index 8d6da9c099..9e7c792b2b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4647,7 +4647,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) @@ -4668,7 +4668,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="; @@ -7786,4 +7786,3 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif /* defined(TOR_UNIT_TESTS) */ - diff --git a/src/or/geoip.c b/src/or/geoip.c index 634ee707b4..8c6afe1c91 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1884,4 +1884,3 @@ geoip_free_all(void) memset(geoip_digest, 0, sizeof(geoip_digest)); memset(geoip6_digest, 0, sizeof(geoip6_digest)); } - |