aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-04-03 05:31:41 +0000
committerRoger Dingledine <arma@torproject.org>2005-04-03 05:31:41 +0000
commit658463a75147238065ccf270ebda7917920c8821 (patch)
tree43e0c5d834c6f3ba616a2f10910224be0185afa4
parent096879687ae2d3444d8b230a66a9182d68df2567 (diff)
downloadtor-658463a75147238065ccf270ebda7917920c8821.tar.gz
tor-658463a75147238065ccf270ebda7917920c8821.zip
clean up the circuit-mark-for-close patch
svn:r3994
-rw-r--r--src/or/circuitlist.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 1e60d48341..0b742afe70 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -399,7 +399,7 @@ void _circuit_mark_for_close(circuit_t *circ, int line, const char *file)
if (circ->marked_for_close) {
log(LOG_WARN,"Duplicate call to circuit_mark_for_close at %s:%d"
- " (first at %s:%d)", line, file,
+ " (first at %s:%d)", file, line,
circ->marked_for_close_file, circ->marked_for_close);
return;
}
@@ -457,7 +457,6 @@ void _circuit_mark_for_close(circuit_t *circ, int line, const char *file)
circuit_mark_for_close(circ->rend_splice);
circ->rend_splice = NULL;
}
- return 0;
}
/** Verify that cpath layer <b>cp</b> has all of its invariants