aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-16 11:17:16 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-16 11:17:16 -0400
commit06939551f4c081c46a09864465a4989ca8bb2e42 (patch)
treefaae1cc3b8521440a54cdfc26b23b53d9a837246 /src
parentfabfa28c48cb50979ec4ee170af2b948f7676ae8 (diff)
downloadtor-06939551f4c081c46a09864465a4989ca8bb2e42.tar.gz
tor-06939551f4c081c46a09864465a4989ca8bb2e42.zip
code style fixes
Diffstat (limited to 'src')
-rw-r--r--src/or/main.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 1bc17a0d7a..39c0f5c89e 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1234,8 +1234,10 @@ static time_to_t time_to = {
* Useful if our clock just moved back a long time from the future,
* so we don't wait until that future arrives again before acting.
*/
-void reset_all_main_loop_timers(void) {
- memset(&time_to, 0, sizeof(time_to_t));
+void
+reset_all_main_loop_timers(void)
+{
+ memset(&time_to, 0, sizeof(time_to));
}
/**
@@ -1318,7 +1320,8 @@ run_scheduled_events(time_t now)
* TLS context. */
if (!time_to.last_rotated_x509_certificate)
time_to.last_rotated_x509_certificate = now;
- if (time_to.last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) {
+ if (time_to.last_rotated_x509_certificate +
+ MAX_SSL_KEY_LIFETIME_INTERNAL < now) {
log_info(LD_GENERAL,"Rotating tls context.");
if (router_initialize_tls_context() < 0) {
log_warn(LD_BUG, "Error reinitializing TLS context");