X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=ef5016ed3a1907f91176ff9ba3ce59e352d7c6e4;hp=fe7d39fa49b5b13d1fc7185c9f36e0a9c714ac8d;hb=1b8455b701df7ac196e35795b9ab8ef2d402058d;hpb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index fe7d39fa..ef5016ed 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -109,7 +109,7 @@ enum {
  */
 static struct poptOption long_options[] = {
 	/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-	{ "output", 'w', POPT_ARG_STRING, NULL, OPT_NONE, NULL, NULL },
+	{ "output", 'w', POPT_ARG_STRING, NULL, OPT_OUTPUT_PATH, NULL, NULL },
 	{ "input-format", 'i', POPT_ARG_STRING, NULL, OPT_INPUT_FORMAT, NULL, NULL },
 	{ "output-format", 'o', POPT_ARG_STRING, NULL, OPT_OUTPUT_FORMAT, NULL, NULL },
 	{ "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL },
@@ -461,7 +461,7 @@ static int traverse_trace_dir(const char *fpath, const struct stat *sb,
  */
 int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 		const char *format_str,
-		void (*packet_seek)(struct stream_pos *pos,
+		void (*packet_seek)(struct bt_stream_pos *pos,
 			size_t offset, int whence))
 {
 
@@ -516,7 +516,7 @@ int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 	return ret;
 }
 
-int convert_trace(struct trace_descriptor *td_write,
+int convert_trace(struct bt_trace_descriptor *td_write,
 		  struct bt_context *ctx)
 {
 	struct bt_ctf_iter *iter;
@@ -556,7 +556,7 @@ int main(int argc, char **argv)
 {
 	int ret, partial_error = 0, open_success = 0;
 	struct format *fmt_write;
-	struct trace_descriptor *td_write;
+	struct bt_trace_descriptor *td_write;
 	struct bt_context *ctx;
 	int i;