Fix whitespace.

This commit is contained in:
Nick Mathewson 2016-03-15 09:21:29 -04:00
parent c9899ee640
commit b48f8a8114
7 changed files with 16 additions and 7 deletions

View File

@ -2074,7 +2074,8 @@ check_private_dir(const char *dirname, cpd_check_t check,
* the file between stat() and chmod(), a potential race exists. * the file between stat() and chmod(), a potential race exists.
* *
* Several suggestions taken from: * Several suggestions taken from:
* https://developer.apple.com/library/mac/documentation/Security/Conceptual/SecureCodingGuide/Articles/RaceConditions.html * https://developer.apple.com/library/mac/documentation/
* Security/Conceptual/SecureCodingGuide/Articles/RaceConditions.html
*/ */
/* Open directory. /* Open directory.
@ -2985,7 +2986,8 @@ expand_filename(const char *filename)
tor_assert(filename); tor_assert(filename);
#ifdef _WIN32 #ifdef _WIN32
/* Might consider using GetFullPathName() as described here: /* Might consider using GetFullPathName() as described here:
* http://etutorials.org/Programming/secure+programming/Chapter+3.+Input+Validation/3.7+Validating+Filenames+and+Paths/ * http://etutorials.org/Programming/secure+programming/
* Chapter+3.+Input+Validation/3.7+Validating+Filenames+and+Paths/
*/ */
return tor_strdup(filename); return tor_strdup(filename);
#else #else

View File

@ -2420,7 +2420,8 @@ build_state_get_exit_nickname(cpath_build_state_t *state)
} }
/** Return true iff the given address can be used to extend to. */ /** Return true iff the given address can be used to extend to. */
int extend_info_addr_is_allowed(const tor_addr_t *addr) int
extend_info_addr_is_allowed(const tor_addr_t *addr)
{ {
tor_assert(addr); tor_assert(addr);
@ -2434,3 +2435,4 @@ int extend_info_addr_is_allowed(const tor_addr_t *addr)
disallow: disallow:
return 0; return 0;
} }

View File

@ -6325,7 +6325,8 @@ parse_port_config(smartlist_t *out,
ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0,
cache_ipv4 = 1, use_cached_ipv4 = 0, cache_ipv4 = 1, use_cached_ipv4 = 0,
cache_ipv6 = 0, use_cached_ipv6 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0,
prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0, prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0,
relax_dirmode_check = 0,
has_used_unix_socket_only_option = 0; has_used_unix_socket_only_option = 0;
smartlist_split_string(elts, ports->value, NULL, smartlist_split_string(elts, ports->value, NULL,
@ -6577,7 +6578,8 @@ parse_port_config(smartlist_t *out,
if ( has_used_unix_socket_only_option && ! unix_socket_path) { if ( has_used_unix_socket_only_option && ! unix_socket_path) {
log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, " log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, "
"WorldWritable, or RelaxDirModeCheck, but it is not a unix socket.", portname); "WorldWritable, or RelaxDirModeCheck, but it is not a "
"unix socket.", portname);
goto err; goto err;
} }

View File

@ -572,7 +572,8 @@ connection_check_event(connection_t *conn, struct event *ev)
conn_type_to_string(conn->type), conn_type_to_string(conn->type),
conn_state_to_string(conn->type, conn->state), conn_state_to_string(conn->type, conn->state),
(int)conn->s, (int)conn->linked, (int)conn->s, (int)conn->linked,
(conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request), (conn->type == CONN_TYPE_AP &&
TO_EDGE_CONN(conn)->is_dns_request),
conn->marked_for_close_file ? conn->marked_for_close_file : "-", conn->marked_for_close_file ? conn->marked_for_close_file : "-",
conn->marked_for_close conn->marked_for_close
); );

View File

@ -1009,3 +1009,4 @@ MOCK_IMPL(int, hid_serv_responsible_for_desc_id,
smartlist_free(responsible); smartlist_free(responsible);
return result; return result;
} }

View File

@ -5395,3 +5395,4 @@ refresh_all_country_info(void)
nodelist_refresh_countries(); nodelist_refresh_countries();
} }