X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace-log.c;h=d429ceb1d0f0edd8765b8588fb6aac2f95920f17;hb=0675eb8c07c440a4d3811ddc95001cc129a9dc17;hp=ca406095970d97d834b4a066be1f622d96685833;hpb=c5a565d9b861d711aa45570d21f819135141b685;p=babeltrace.git

diff --git a/cli/babeltrace-log.c b/cli/babeltrace-log.c
index ca406095..d429ceb1 100644
--- a/cli/babeltrace-log.c
+++ b/cli/babeltrace-log.c
@@ -23,7 +23,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <assert.h>
+#include <string.h>
+#include <babeltrace/assert-internal.h>
 #include <babeltrace/babeltrace.h>
 #include <popt.h>
 #include <glib.h>
@@ -95,7 +96,7 @@ int parse_params(int argc, char *argv[], char **output_path,
 	}
 
 	*output_path = strdup(leftover);
-	assert(*output_path);
+	BT_ASSERT(*output_path);
 	goto end;
 
 error:
@@ -121,8 +122,6 @@ int main(int argc, char *argv[])
 		"--component",
 		"dmesg:src.text.dmesg",
 		"--params",
-		"read-from-stdin=yes",
-		"--params",
 		NULL, /* no-extract-timestamp=? placeholder */
 		"--component",
 		"ctf:sink.ctf.fs",
@@ -143,14 +142,14 @@ int main(int argc, char *argv[])
 	}
 
 	if (no_extract_ts) {
-		bt_argv[7] = "no-extract-timestamp=yes";
+		bt_argv[5] = "no-extract-timestamp=yes";
 	} else {
-		bt_argv[7] = "no-extract-timestamp=no";
+		bt_argv[5] = "no-extract-timestamp=no";
 	}
 
-	bt_argv[13] = output_path;
+	bt_argv[11] = output_path;
 	(void) g_spawn_sync(NULL, bt_argv, NULL,
-		G_SPAWN_DEFAULT | G_SPAWN_CHILD_INHERITS_STDIN, NULL, NULL,
+		G_SPAWN_CHILD_INHERITS_STDIN, NULL, NULL,
 		NULL, NULL, &retcode, &error);
 
 	if (error) {