diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-19 16:58:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-19 16:58:22 -0500 |
| commit | e361de80bbca479a68345a3e0db4243da00e5e38 (patch) | |
| tree | a9706abd77a41058d3ead33e06a4bf27c5bb56a1 /src/or/rephist.c | |
| parent | 21be4b5b4ca4412c958a80e65279e5f1babe8535 (diff) | |
| parent | a33b338c5bf5e40037f465c0257a70dedb095e82 (diff) | |
| download | tor-e361de80bbca479a68345a3e0db4243da00e5e38.tar.gz tor-e361de80bbca479a68345a3e0db4243da00e5e38.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/router.c
Diffstat (limited to 'src/or/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index 412b864a3f..d41d715aee 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1445,7 +1445,7 @@ rep_hist_fill_bandwidth_history(char *buf, size_t len, bw_array_t *b) * history in its descriptor. */ char * -rep_hist_get_bandwidth_lines(int for_extrainfo) +rep_hist_get_bandwidth_lines(void) { char *buf, *cp; char t[ISO_TIME_LEN+1]; @@ -1479,9 +1479,8 @@ rep_hist_get_bandwidth_lines(int for_extrainfo) } tor_assert(b); format_iso_time(t, b->next_period-NUM_SECS_BW_SUM_INTERVAL); - tor_snprintf(cp, len-(cp-buf), "%s%s %s (%d s) ", - for_extrainfo ? "" : "opt ", desc, t, - NUM_SECS_BW_SUM_INTERVAL); + tor_snprintf(cp, len-(cp-buf), "%s %s (%d s) ", + desc, t, NUM_SECS_BW_SUM_INTERVAL); cp += strlen(cp); cp += rep_hist_fill_bandwidth_history(cp, len-(cp-buf), b); strlcat(cp, "\n", len-(cp-buf)); |