1 files changed, 8 insertions, 2 deletions
diff --git a/bbot/diagnostics.cxx b/bbot/diagnostics.cxx
index f3a2bb9..d528221 100644
--- a/bbot/diagnostics.cxx
+++ b/bbot/diagnostics.cxx
@@ -25,14 +25,20 @@ namespace bbot
       r << type_;
 
     if (name_ != nullptr)
-      r << name_ << ": ";
+      r << name_;
+
+    if (data_ != nullptr)
+      r << '(' << data_ << ')';
+
+    if (name_ != nullptr || data_ != nullptr)
+      r << ": ";
   }
 
   const char* trace_type = "trace: ";
   const char* trace_indent = "\n  ";
 
   trace_mark_base::
-  trace_mark_base (const char* name, const void* data)
+  trace_mark_base (const char* name, const char* data)
       : basic_mark_base (trace_type, trace_indent, name, data)
   {
   }