aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
Diffstat (limited to 'src/or')
-rw-r--r--src/or/circuitlist.c4
-rw-r--r--src/or/control.c4
-rw-r--r--src/or/directory.c3
-rw-r--r--src/or/dns.c4
-rw-r--r--src/or/routerlist.c11
5 files changed, 14 insertions, 12 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 5761890924..86b0aa097a 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -359,8 +359,8 @@ channel_note_destroy_pending(channel_t *chan, circid_t id)
/** Called to indicate that a DESTROY is no longer pending on <b>chan</b> with
* circuit ID <b>id</b> -- typically, because it has been sent. */
-MOCK_IMPL(void, channel_note_destroy_not_pending,
- (channel_t *chan, circid_t id))
+MOCK_IMPL(void,
+channel_note_destroy_not_pending,(channel_t *chan, circid_t id))
{
circuit_t *circ = circuit_get_by_circid_channel_even_if_marked(id,chan);
if (circ) {
diff --git a/src/or/control.c b/src/or/control.c
index 083768c3d3..9454a7ab67 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -6709,8 +6709,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress)
* is the connection that caused this problem.
*/
MOCK_IMPL(void,
- control_event_bootstrap_problem, (const char *warn, int reason,
- or_connection_t *or_conn))
+control_event_bootstrap_problem, (const char *warn, int reason,
+ or_connection_t *or_conn))
{
int status = bootstrap_percent;
const char *tag = "", *summary = "";
diff --git a/src/or/directory.c b/src/or/directory.c
index a8f9788fde..acd694ffee 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -565,7 +565,8 @@ dir_consensus_request_set_additional_headers(directory_request_t *req,
* Use <b>pds_flags</b> as arguments to router_pick_directory_server()
* or router_pick_trusteddirserver().
*/
-MOCK_IMPL(void, directory_get_from_dirserver, (
+MOCK_IMPL(void,
+directory_get_from_dirserver,(
uint8_t dir_purpose,
uint8_t router_purpose,
const char *resource,
diff --git a/src/or/dns.c b/src/or/dns.c
index 024a21abfe..8a40a70d78 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -2086,8 +2086,8 @@ assert_cache_ok_(void)
#endif
-cached_resolve_t
-*dns_get_cache_entry(cached_resolve_t *query)
+cached_resolve_t *
+dns_get_cache_entry(cached_resolve_t *query)
{
return HT_FIND(cache_map, &cache_root, query);
}
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index a790265afb..0e45f63f70 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -426,8 +426,8 @@ list_sk_digests_for_authority_id, (const char *digest))
* download_status_t or NULL if none exists. */
MOCK_IMPL(download_status_t *,
- download_status_for_authority_id_and_sk,
- (const char *id_digest, const char *sk_digest))
+download_status_for_authority_id_and_sk,(const char *id_digest,
+ const char *sk_digest))
{
download_status_t *dl = NULL;
cert_list_t *cl = NULL;
@@ -4874,9 +4874,10 @@ list_pending_fpsk_downloads(fp_pair_map_t *result)
* range.) If <b>source</b> is given, download from <b>source</b>;
* otherwise, download from an appropriate random directory server.
*/
-MOCK_IMPL(STATIC void, initiate_descriptor_downloads,
- (const routerstatus_t *source, int purpose, smartlist_t *digests,
- int lo, int hi, int pds_flags))
+MOCK_IMPL(STATIC void,
+initiate_descriptor_downloads,(const routerstatus_t *source,
+ int purpose, smartlist_t *digests,
+ int lo, int hi, int pds_flags))
{
char *resource, *cp;
int digest_len, enc_digest_len;