From: Julien Desfossez <jdesfossez@efficios.com>
Date: Fri, 17 Mar 2017 20:15:23 +0000 (-0400)
Subject: Fix: text output missing separator when printing the domain
X-Git-Tag: v2.0.0-pre1~908
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=b65c74551ba6042dc10a8a7a2c1ae27a30284449

Fix: text output missing separator when printing the domain

With the "-f all" option, we expect to see
<hostname>:<domain>:<loglevel>, but instead we see
<hostname><domain>:<loglevel>.

Judging from the pattern of the other printed fields, the check for
"dom_print" variable seems to be missing when printing the domain.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index f6151617..69450cf5 100644
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -350,6 +350,8 @@ int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definitio
 		set_field_names_print(pos, ITEM_HEADER);
 		if (pos->print_names) {
 			fprintf(pos->fp, "trace:domain = ");
+		} else if (dom_print) {
+			fprintf(pos->fp, ":");
 		}
 		fprintf(pos->fp, "%s", stream_class->trace->env.domain);
 		if (pos->print_names)