summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-11 14:53:17 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-16 15:07:47 -0500
commit5579bc0eafc7ef426922e23340a5f885f8e8d4e9 (patch)
tree7e234f80696dd17f212afba95b75e81a632bd03e
parent9c29369a04cdf47bd882579331577d82305bf785 (diff)
downloadtor-5579bc0eafc7ef426922e23340a5f885f8e8d4e9.tar.gz
tor-5579bc0eafc7ef426922e23340a5f885f8e8d4e9.zip
whitespace fixes
-rw-r--r--changes/clean_asprintf2
-rw-r--r--src/or/control.c1
-rw-r--r--src/or/router.c3
3 files changed, 3 insertions, 3 deletions
diff --git a/changes/clean_asprintf b/changes/clean_asprintf
index 61382010e6..ebaabd775f 100644
--- a/changes/clean_asprintf
+++ b/changes/clean_asprintf
@@ -2,4 +2,4 @@
- Use the smartlist_add_asprintf alias more consistently
throughout the codebase.
- Convert more instances of tor_snprintf+tor_strdup into
- tor_asprintf. \ No newline at end of file
+ tor_asprintf.
diff --git a/src/or/control.c b/src/or/control.c
index 2548a5c200..1d2d8dd392 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1815,7 +1815,6 @@ circuit_describe_status_for_controller(origin_circuit_t *circ)
if (circ->rend_data != NULL) {
smartlist_add_asprintf(descparts, "REND_QUERY=%s",
circ->rend_data->onion_address);
-
}
{
diff --git a/src/or/router.c b/src/or/router.c
index f8aa1e3b05..0339e682a8 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1973,7 +1973,8 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
format_iso_time(published, router->cache_info.published_on);
if (router->declared_family && smartlist_len(router->declared_family)) {
- char *family = smartlist_join_strings(router->declared_family, " ", 0, NULL);
+ char *family = smartlist_join_strings(router->declared_family,
+ " ", 0, NULL);
tor_asprintf(&family_line, "family %s\n", family);
tor_free(family);
} else {