diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-21 14:23:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-21 14:23:32 -0400 |
| commit | 8dcc015975856cde2b78f903fd85a0dc7163dfcd (patch) | |
| tree | a0765df1d7ac042a9a47aed0abbaab10c4b76cb2 /src/or | |
| parent | 7f2dbbe5853eb3b9900789f5b0b66c1a3a0eb1b3 (diff) | |
| download | tor-8dcc015975856cde2b78f903fd85a0dc7163dfcd.tar.gz tor-8dcc015975856cde2b78f903fd85a0dc7163dfcd.zip | |
Fix wide lines in dirauth/dirvote.*
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dirauth/dirvote.c | 11 | ||||
| -rw-r--r-- | src/or/dirauth/dirvote.h | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/or/dirauth/dirvote.c b/src/or/dirauth/dirvote.c index a9429a9116..16439905a2 100644 --- a/src/or/dirauth/dirvote.c +++ b/src/or/dirauth/dirvote.c @@ -4235,7 +4235,7 @@ routers_make_ed_keys_unique(smartlist_t *routers) if (ri2_pub < ri_pub || (ri2_pub == ri_pub && fast_memcmp(ri->cache_info.signed_descriptor_digest, - ri2->cache_info.signed_descriptor_digest,DIGEST_LEN)<0)) { + ri2->cache_info.signed_descriptor_digest,DIGEST_LEN)<0)) { digest256map_set(by_ed_key, pk, ri); ri2->omit_from_vote = 1; } else { @@ -4408,10 +4408,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, vrs->protocols = tor_strdup(ri->protocol_list); } else { vrs->protocols = tor_strdup( - protover_compute_for_old_tor(vrs->version)); + protover_compute_for_old_tor(vrs->version)); } vrs->microdesc = dirvote_format_all_microdesc_vote_lines(ri, now, - microdescriptors); + microdescriptors); smartlist_add(routerstatuses, vrs); } @@ -4504,9 +4504,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, /* We should not recommend anything we don't have. */ tor_assert_nonfatal(protover_all_supported( - v3_out->recommended_relay_protocols, NULL)); + v3_out->recommended_relay_protocols, NULL)); tor_assert_nonfatal(protover_all_supported( - v3_out->recommended_client_protocols, NULL)); + v3_out->recommended_client_protocols, NULL)); v3_out->package_lines = smartlist_new(); { @@ -4562,4 +4562,3 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, return v3_out; } - diff --git a/src/or/dirauth/dirvote.h b/src/or/dirauth/dirvote.h index d98d887e02..7ce8e4a699 100644 --- a/src/or/dirauth/dirvote.h +++ b/src/or/dirauth/dirvote.h @@ -164,7 +164,8 @@ dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out) } static inline int -dirvote_add_signatures(const char *detached_signatures_body, const char *source, +dirvote_add_signatures(const char *detached_signatures_body, + const char *source, const char **msg_out) { (void) detached_signatures_body; @@ -244,4 +245,3 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, #endif /* defined(DIRVOTE_PRIVATE) */ #endif /* !defined(TOR_DIRVOTE_H) */ - |