nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

clang scan-build: Fix "dead increment" warnings.

Browse Source 
For the most part, these indicated a spot where the code could have
been better.
This commit is contained in:
Nick Mathewson 2017-09-12 17:20:09 -04:00
parent 0f58e17313
commit a4847ffa91
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/util.c
View File

@ -445,7 +445,7 @@ tor_log2(uint64_t u64)
r += 2; r += 2;
} }
if (u64 >= (U64_LITERAL(1)<<1)) { if (u64 >= (U64_LITERAL(1)<<1)) {
u64 >>= 1; // u64 >>= 1; // not using this any more.
r += 1; r += 1;
} }
return r; return r;

6
src/or/directory.c
View File

@ -3823,7 +3823,6 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers,
char *url, *url_mem, *header; char *url, *url_mem, *header;
time_t if_modified_since = 0; time_t if_modified_since = 0;
int zlib_compressed_in_url; int zlib_compressed_in_url;
size_t url_len;
unsigned compression_methods_supported; unsigned compression_methods_supported;
/* We ignore the body of a GET request. */ /* We ignore the body of a GET request. */
@ -3854,12 +3853,13 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers,
log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url)); log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url));
url_mem = url; url_mem = url;
url_len = strlen(url); {
size_t url_len = strlen(url);
zlib_compressed_in_url = url_len > 2 && !strcmp(url+url_len-2, ".z"); zlib_compressed_in_url = url_len > 2 && !strcmp(url+url_len-2, ".z");
if (zlib_compressed_in_url) { if (zlib_compressed_in_url) {
url[url_len-2] = '\0'; url[url_len-2] = '\0';
url_len -= 2; }
} }
if ((header = http_get_header(headers, "Accept-Encoding: "))) { if ((header = http_get_header(headers, "Accept-Encoding: "))) {

6
src/or/routerparse.c
View File

@ -2934,7 +2934,7 @@ networkstatus_verify_bw_weights(networkstatus_t *ns, int consensus_method)
} }
Wgg /= weight_scale; Wgg /= weight_scale;
Wgm /= weight_scale; Wgm /= weight_scale; (void) Wgm; // unused from here on.
Wgd /= weight_scale; Wgd /= weight_scale;
Wmg /= weight_scale; Wmg /= weight_scale;
@ -2942,8 +2942,8 @@ networkstatus_verify_bw_weights(networkstatus_t *ns, int consensus_method)
Wme /= weight_scale; Wme /= weight_scale;
Wmd /= weight_scale; Wmd /= weight_scale;
Weg /= weight_scale; Weg /= weight_scale; (void) Weg; // unused from here on.
Wem /= weight_scale; Wem /= weight_scale; (void) Wem; // unused from here on.
Wee /= weight_scale; Wee /= weight_scale;
Wed /= weight_scale; Wed /= weight_scale;

1
src/test/test_hs_descriptor.c
View File

@ -90,6 +90,7 @@ test_cert_encoding(void *arg)
pos += b64_cert_len; pos += b64_cert_len;
tt_int_op(strcmpstart(pos, "-----END ED25519 CERT-----"), OP_EQ, 0); tt_int_op(strcmpstart(pos, "-----END ED25519 CERT-----"), OP_EQ, 0);
pos += strlen("-----END ED25519 CERT-----"); pos += strlen("-----END ED25519 CERT-----");
tt_str_op(pos, OP_EQ, "");
} }
done: done: