Fix check-spaces complaints

This commit is contained in:
Sebastian Hahn
2015-02-06 21:36:40 +01:00
parent 6d8b614729
commit e0c3de40ad
4 changed files with 7 additions and 7 deletions
+1 -3
View File
@@ -1601,7 +1601,6 @@ connection_init_accepted_conn(connection_t *conn,
return 0;
}
static int
connection_connect_sockaddr(connection_t *conn,
const struct sockaddr *sa,
@@ -1688,11 +1687,10 @@ connection_connect_sockaddr(connection_t *conn,
*socket_error = SOCK_ERRNO(ENOBUFS);
return -1;
}
return inprogress ? 0 : 1;
}
/** Take conn, make a nonblocking socket; try to connect to
* addr:port (they arrive in *host order*). If fail, return -1 and if
* applicable put your best guess about errno into *<b>socket_error</b>.
+4 -2
View File
@@ -1886,13 +1886,15 @@ circuit_describe_status_for_controller(origin_circuit_t *circ)
if (circ->socks_username_len > 0) {
char* socks_username_escaped = esc_for_log_len(circ->socks_username,
(size_t) circ->socks_username_len);
smartlist_add_asprintf(descparts, "SOCKS_USERNAME=%s", socks_username_escaped);
smartlist_add_asprintf(descparts, "SOCKS_USERNAME=%s",
socks_username_escaped);
tor_free(socks_username_escaped);
}
if (circ->socks_password_len > 0) {
char* socks_password_escaped = esc_for_log_len(circ->socks_password,
(size_t) circ->socks_password_len);
smartlist_add_asprintf(descparts, "SOCKS_PASSWORD=%s", socks_password_escaped);
smartlist_add_asprintf(descparts, "SOCKS_PASSWORD=%s",
socks_password_escaped);
tor_free(socks_password_escaped);
}
+2 -1
View File
@@ -106,7 +106,8 @@ test_onion_handshake(void *arg)
/* client handshake 2 */
memset(c_keys, 0, 40);
tt_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys, 40, NULL));
tt_assert(! onion_skin_TAP_client_handshake(c_dh, s_buf, c_keys,
40, NULL));
tt_mem_op(c_keys,OP_EQ, s_keys, 40);
memset(s_buf, 0, 40);
-1
View File
@@ -3079,7 +3079,6 @@ test_dir_packages(void *arg)
ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy");
ADD(2, "cbc 99.1.11.1.2 http://example.com/ cubehash=ahooy");
res = compute_consensus_package_lines(votes);
tt_assert(res);
tt_str_op(res, ==,