diff options
-rw-r--r-- | src/common/util_process.c | 3 | ||||
-rw-r--r-- | src/common/util_process.h | 1 | ||||
-rw-r--r-- | src/or/circuitlist.c | 1 | ||||
-rw-r--r-- | src/or/circuitmux.c | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/common/util_process.c b/src/common/util_process.c index 8ccf7f38f..d6ef59016 100644 --- a/src/common/util_process.c +++ b/src/common/util_process.c @@ -52,7 +52,8 @@ process_map_entry_hash_(const waitpid_callback_t *ent) } static INLINE unsigned int -process_map_entries_eq_(const waitpid_callback_t *a, const waitpid_callback_t *b) +process_map_entries_eq_(const waitpid_callback_t *a, + const waitpid_callback_t *b) { return a->pid == b->pid; } diff --git a/src/common/util_process.h b/src/common/util_process.h index 877702c68..0b268b85d 100644 --- a/src/common/util_process.h +++ b/src/common/util_process.h @@ -23,3 +23,4 @@ void notify_pending_waitpid_callbacks(void); #endif #endif + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index a2dd07fbe..f3a83503e 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1122,7 +1122,6 @@ circuit_id_when_marked_unusable_on_channel(circid_t circ_id, channel_t *chan) return found->made_placeholder_at; } - /** Return the circuit that a given edge connection is using. */ circuit_t * circuit_get_by_edge_conn(edge_connection_t *conn) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 563166eb4..55580d5c2 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -1944,3 +1944,4 @@ circuitmux_count_queued_destroy_cells(const channel_t *chan, return n_destroy_cells; } + |