[or-cvs] r8701: Fix for last patch. "", though empty, is true. This ain't Py (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-10-13 01:42:57 -0400 (Fri, 13 Oct 2006)
New Revision: 8701

Modified:
   tor/trunk/
   tor/trunk/src/or/control.c
Log:
 r9021 at totoro:  nickm | 2006-10-13 01:42:45 -0400
 Fix for last patch. "", though empty, is true.  This ain't Python, Nick.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9021] on 96637b51-b116-0410-a10e-9941ebb49b64

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2006-10-13 05:36:00 UTC (rev 8700)
+++ tor/trunk/src/or/control.c	2006-10-13 05:42:57 UTC (rev 8701)
@@ -2875,17 +2875,19 @@
     }
 
     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);
     }
   }