#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>
}
*output_path = strdup(leftover);
- assert(*output_path);
+ BT_ASSERT(*output_path);
goto end;
error:
"--component",
"dmesg:src.text.dmesg",
"--params",
- "read-from-stdin=yes",
- "--params",
NULL, /* no-extract-timestamp=? placeholder */
"--component",
"ctf:sink.ctf.fs",
}
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) {