summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-08-16 00:29:27 +0200
committerSebastian Hahn <sebastian@torproject.org>2010-08-16 00:46:44 +0200
commit561ca9b987e093755603f1cce8f7d783c7b3006e (patch)
tree986bcf1fab60a67173acf883cd0a59f647af6473
parenta64e660f0e146d8530da74d74bc9c196e6ac21fe (diff)
downloadtor-561ca9b987e093755603f1cce8f7d783c7b3006e.tar.gz
tor-561ca9b987e093755603f1cce8f7d783c7b3006e.zip
Fix misplaced labels
-rw-r--r--src/or/circuitbuild.c4
-rw-r--r--src/or/connection.c2
-rw-r--r--src/or/connection_edge.c4
-rw-r--r--src/or/control.c2
-rw-r--r--src/or/cpuworker.c2
-rw-r--r--src/or/dirvote.c2
-rw-r--r--src/or/geoip.c2
-rw-r--r--src/or/policies.c4
-rw-r--r--src/or/relay.c2
-rw-r--r--src/or/rendclient.c2
-rw-r--r--src/test/test.c2
-rw-r--r--src/test/test_dir.c2
12 files changed, 15 insertions, 15 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 8d6d9f47ed..7bb6103752 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -729,7 +729,7 @@ circuit_build_times_parse_state(circuit_build_times_t *cbt,
circuit_build_times_filter_timeouts(cbt);
}
-done:
+ done:
tor_free(loaded_times);
return err ? -1 : 0;
}
@@ -1514,7 +1514,7 @@ static int
onion_populate_cpath(origin_circuit_t *circ)
{
int r;
-again:
+ again:
r = onion_extend_cpath(circ);
if (r < 0) {
log_info(LD_CIRC,"Generating cpath hop failed.");
diff --git a/src/or/connection.c b/src/or/connection.c
index 55d2fa8146..9956172600 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2355,7 +2355,7 @@ connection_handle_read_impl(connection_t *conn)
return 0;
}
-loop_again:
+ loop_again:
try_to_read = max_to_read;
tor_assert(!conn->marked_for_close);
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index e83028faef..64f3429930 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2050,7 +2050,7 @@ get_unique_stream_id_by_circ(origin_circuit_t *circ)
streamid_t test_stream_id;
uint32_t attempts=0;
-again:
+ again:
test_stream_id = circ->next_stream_id++;
if (++attempts > 1<<16) {
/* Make sure we don't loop forever if all stream_id's are used. */
@@ -2988,7 +2988,7 @@ parse_extended_hostname(char *address, int allowdotexit)
if (rend_valid_service_id(query)) {
return ONION_HOSTNAME; /* success */
}
-failed:
+ failed:
/* otherwise, return to previous state and return 0 */
*s = '.';
return BAD_HOSTNAME;
diff --git a/src/or/control.c b/src/or/control.c
index 7cbb1bd1f6..7eead0e18a 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2259,7 +2259,7 @@ handle_control_setcircuitpurpose(control_connection_t *conn,
circ->_base.purpose = new_purpose;
connection_write_str_to_buf("250 OK\r\n", conn);
-done:
+ done:
if (args) {
SMARTLIST_FOREACH(args, char *, cp, tor_free(cp));
smartlist_free(args);
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index 2760d96665..6f943d78b8 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -192,7 +192,7 @@ connection_cpu_process_inbuf(connection_t *conn)
tor_assert(0); /* don't ask me to do handshakes yet */
}
-done_processing:
+ done_processing:
conn->state = CPUWORKER_STATE_IDLE;
num_cpuworkers_busy--;
if (conn->timestamp_created < last_rotation_time) {
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 925f57f6e8..eae3bc8a40 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -762,7 +762,7 @@ networkstatus_check_weights(int64_t Wgg, int64_t Wgd, int64_t Wmg,
}
}
-out:
+ out:
if (berr) {
log_info(LD_DIR,
"Bw weight mismatch %d. G="I64_FORMAT" M="I64_FORMAT
diff --git a/src/or/geoip.c b/src/or/geoip.c
index cde9cabdb3..d9c8a01519 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -829,7 +829,7 @@ geoip_get_client_history(geoip_client_action_t action)
smartlist_add(chunks, buf);
});
result = smartlist_join_strings(chunks, ",", 0, NULL);
-done:
+ done:
tor_free(counts);
if (chunks) {
SMARTLIST_FOREACH(chunks, char *, c, tor_free(c));
diff --git a/src/or/policies.c b/src/or/policies.c
index db3c6d886b..4fd0904152 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -381,7 +381,7 @@ validate_addr_policies(or_options_t *options, char **msg)
ADDR_POLICY_ACCEPT))
REJECT("Error in ReachableDirAddresses entry.");
-err:
+ err:
addr_policy_list_free(addr_policy);
return *msg ? -1 : 0;
#undef REJECT
@@ -1272,7 +1272,7 @@ policy_summarize(smartlist_t *policy)
result = tor_malloc(final_size);
tor_snprintf(result, final_size, "%s %s", prefix, shorter_str);
-cleanup:
+ cleanup:
/* cleanup */
SMARTLIST_FOREACH(summary, policy_summary_item_t *, s, tor_free(s));
smartlist_free(summary);
diff --git a/src/or/relay.c b/src/or/relay.c
index 22ecdaafa0..b2de91da85 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1326,7 +1326,7 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial)
return 0;
}
-repeat_connection_edge_package_raw_inbuf:
+ repeat_connection_edge_package_raw_inbuf:
circ = circuit_get_by_edge_conn(conn);
if (!circ) {
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 0377f121cc..68abb886a8 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -209,7 +209,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
introcirc->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT;
return 0;
-err:
+ err:
circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL);
circuit_mark_for_close(TO_CIRCUIT(rendcirc), END_CIRC_REASON_INTERNAL);
return -1;
diff --git a/src/test/test.c b/src/test/test.c
index 6e5abcb97d..c1d2ecbfb9 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -619,7 +619,7 @@ test_circuit_timeout(void)
circuit_build_times_count_timeout(&final, 1);
}
-done:
+ done:
return;
}
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index a129bf9777..80d2379de6 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -580,7 +580,7 @@ test_dir_measured_bw(void)
"557365204145532d32353620696e73746561642e") == 0);
}
-done:
+ done:
return;
}