Fix formatting in various places after 6465/6816 work

This commit is contained in:
Andrea Shepard
2012-10-10 00:48:36 -07:00
parent 217352c362
commit 5543c5b202
6 changed files with 11 additions and 10 deletions
+4 -2
View File
@@ -244,8 +244,10 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir)
}
if (SSLeay() < OPENSSL_V_SERIES(1,0,0)) {
log_notice(LD_CRYPTO, "Your OpenSSL version seems to be %s. We "
"recommend 1.0.0 or later.", crypto_openssl_get_version_str());
log_notice(LD_CRYPTO,
"Your OpenSSL version seems to be %s. We recommend 1.0.0 "
"or later.",
crypto_openssl_get_version_str());
}
if (useAccel > 0) {
+3 -2
View File
@@ -1518,7 +1518,7 @@ cell_queue_entry_dup(cell_queue_entry_t *q)
rv = tor_malloc(sizeof(*rv));
memcpy(rv, q, sizeof(*rv));
return rv;
}
@@ -1529,7 +1529,8 @@ cell_queue_entry_dup(cell_queue_entry_t *q)
*/
static void
cell_queue_entry_free(cell_queue_entry_t *q, int handed_off) {
cell_queue_entry_free(cell_queue_entry_t *q, int handed_off)
{
if (!q) return;
if (!handed_off) {
+1 -1
View File
@@ -412,7 +412,7 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux)
* Update active_circuits et al.; this does policy notifies, so
* comes before freeing policy data
*/
if (to_remove->muxinfo.cell_count > 0) {
circuitmux_make_circuit_inactive(cmux, circ, CELL_DIRECTION_IN);
}
+3 -3
View File
@@ -168,7 +168,7 @@ ewma_free_circ_data(circuitmux_t *cmux,
circuitmux_policy_data_t *pol_data,
circuit_t *circ,
circuitmux_policy_circ_data_t *pol_circ_data);
static void
static void
ewma_notify_circ_active(circuitmux_t *cmux,
circuitmux_policy_data_t *pol_data,
circuit_t *circ,
@@ -329,7 +329,7 @@ ewma_free_circ_data(circuitmux_t *cmux,
* the active_circuits_pqueue.
*/
static void
static void
ewma_notify_circ_active(circuitmux_t *cmux,
circuitmux_policy_data_t *pol_data,
circuit_t *circ,
@@ -354,7 +354,7 @@ ewma_notify_circ_active(circuitmux_t *cmux,
* the active_circuits_pqueue.
*/
static void
static void
ewma_notify_circ_inactive(circuitmux_t *cmux,
circuitmux_policy_data_t *pol_data,
circuit_t *circ,
-1
View File
@@ -1389,7 +1389,6 @@ options_act(const or_options_t *old_options)
channel_set_cmux_policy_everywhere(NULL);
}
/* Update the BridgePassword's hashed version as needed. We store this as a
* digest so that we can do side-channel-proof comparisons on it.
*/
-1
View File
@@ -1844,7 +1844,6 @@ networkstatus_set_current_consensus(const char *consensus,
channel_set_cmux_policy_everywhere(NULL);
}
/* XXXX024 this call might be unnecessary here: can changing the
* current consensus really alter our view of any OR's rate limits? */
connection_or_update_token_buckets(get_connection_array(), options);