From 45b16c2d9ec7ab49f09fe43f07d84b5dcc252bd1 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 13 Oct 2006 05:42:57 +0000 Subject: [PATCH] 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 --- src/or/control.c | 6 ++++-- 1 file 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); } }