diff options
author | Nick Mathewson <nickm@torproject.org> | 2006-10-13 05:42:57 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2006-10-13 05:42:57 +0000 |
commit | 45b16c2d9ec7ab49f09fe43f07d84b5dcc252bd1 (patch) | |
tree | b52c6939d0f9cb11195dddf4c1879dfd8f93d3b0 /src/or/control.c | |
parent | d453fd37097402f2416ba994107a642a35fcf223 (diff) | |
download | tor-45b16c2d9ec7ab49f09fe43f07d84b5dcc252bd1.tar.gz tor-45b16c2d9ec7ab49f09fe43f07d84b5dcc252bd1.zip |
r9021@totoro: nickm | 2006-10-13 01:42:45 -0400
Fix for last patch. "", though empty, is true. This ain't Python, Nick.
svn:r8701
Diffstat (limited to 'src/or/control.c')
-rw-r--r-- | src/or/control.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index d937da0206..18d59607da 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2875,17 +2875,19 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, } if (EVENT_IS_INTERESTING1S(EVENT_CIRCUIT_STATUS)) { + const char *sp = strlen(path) ? " " : ""; send_control1_event_extended(EVENT_CIRCUIT_STATUS, SHORT_NAMES, "650 CIRC %lu %s%s%s@%s\r\n", (unsigned long)circ->global_identifier, - status, path?" ":"", path, reason); + status, sp, path, reason); } if (EVENT_IS_INTERESTING1L(EVENT_CIRCUIT_STATUS)) { char *vpath = circuit_list_path_for_controller(circ); + const char *sp = strlen(vpath) ? " " : ""; send_control1_event_extended(EVENT_CIRCUIT_STATUS, LONG_NAMES, "650 CIRC %lu %s%s%s@%s\r\n", (unsigned long)circ->global_identifier, - status, vpath?" ":"", vpath, reason); + status, sp, vpath, reason); tor_free(vpath); } } |