aboutsummaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-04-18 11:13:36 -0400
committerNick Mathewson <nickm@torproject.org>2013-04-18 11:13:36 -0400
commit8362f8854aa3e36b766724226a3baec4d325c1c0 (patch)
treed309eb1c3b9502b4323405f1a312f04dd868077c /src/or/networkstatus.c
parentcd1cdae0fac33bca359b34dae4062fe87a351661 (diff)
parent4b15606fa2848f5112599865eb7b15ef2178e66a (diff)
downloadtor-8362f8854aa3e36b766724226a3baec4d325c1c0.tar
tor-8362f8854aa3e36b766724226a3baec4d325c1c0.tar.gz
Merge branch 'less_charbuf_rebased' into maint-0.2.4
Conflicts: src/or/dirserv.c src/or/dirserv.h src/test/test_dir.c
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r--src/or/networkstatus.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 8846cd063..f5428f165 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2115,9 +2115,7 @@ signed_descs_update_status_from_consensus_networkstatus(smartlist_t *descs)
char *
networkstatus_getinfo_helper_single(const routerstatus_t *rs)
{
- char buf[RS_ENTRY_LEN+1];
- routerstatus_format_entry(buf, sizeof(buf), rs, NULL, NS_CONTROL_PORT, NULL);
- return tor_strdup(buf);
+ return routerstatus_format_entry(rs, NULL, NS_CONTROL_PORT, NULL);
}
/** Alloc and return a string describing routerstatuses for the most