Remove all code that depends on trace collection directory structure

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index f872e6dc30ccea4ca06b9f84cae475f4e0a2bb5b..f75a7976a9523cbc2b44de83ffb0d50f6bb4d03e 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -101,7 +101,7 @@ static void list_formats(FILE *fp)
 
 static void usage(FILE *fp)
 {
-       fprintf(fp, "BabelTrace Trace Converter %s\n\n", VERSION);
+       fprintf(fp, "BabelTrace Trace Viewer and Converter %s\n\n", VERSION);
        fprintf(fp, "usage : babeltrace [OPTIONS] INPUT <OUTPUT>\n");
        fprintf(fp, "\n");
        fprintf(fp, "  INPUT                          Input trace path\n");
@@ -167,7 +167,6 @@ static int get_fields_args(poptContext *pc)
 {
        char *str, *strlist, *strctx;
 
-       opt_payload_field_names = 0;
        strlist = (char *) poptGetOptArg(*pc);
        if (!strlist) {
                return -EINVAL;
@@ -482,36 +481,36 @@ error:
 int convert_trace(struct trace_descriptor *td_write,
                  struct bt_context *ctx)
 {
-       struct babeltrace_iter *iter;
+       struct bt_iter *iter;
        struct ctf_stream *stream;
        struct ctf_stream_event *event;
        struct ctf_text_stream_pos *sout;
-       struct trace_collection_pos begin_pos;
+       struct bt_iter_pos begin_pos;
        int ret;
 
        sout = container_of(td_write, struct ctf_text_stream_pos,
                        trace_descriptor);
 
        begin_pos.type = BT_SEEK_BEGIN;
-       iter = babeltrace_iter_create(ctx, &begin_pos, NULL);
+       iter = bt_iter_create(ctx, &begin_pos, NULL);
        if (!iter) {
                ret = -1;
                goto error_iter;
        }
-       while (babeltrace_iter_read_event(iter, &stream, &event) == 0) {
+       while (bt_iter_read_event(iter, &stream, &event) == 0) {
                ret = sout->parent.event_cb(&sout->parent, stream);
                if (ret) {
                        fprintf(stderr, "[error] Writing event failed.\n");
                        goto end;
                }
-               ret = babeltrace_iter_next(iter);
+               ret = bt_iter_next(iter);
                if (ret < 0)
                        goto end;
        }
        ret = 0;
 
 end:
-       babeltrace_iter_destroy(iter);
+       bt_iter_destroy(iter);
 error_iter:
        return ret;
 }
@@ -547,9 +546,8 @@ static int traverse_dir(const char *fpath, const struct stat *sb,
        } else {
                close(fd);
                close(dirfd);
-               td_read = fmt_read->open_trace(opt_input_path,
-                               fpath, O_RDONLY, ctf_move_pos_slow,
-                               NULL);
+               td_read = fmt_read->open_trace(fpath, O_RDONLY,
+                               ctf_move_pos_slow, NULL);
                if (!td_read) {
                        fprintf(stderr, "Error opening trace \"%s\" "
                                        "for reading.\n\n", fpath);
@@ -635,7 +633,7 @@ int main(int argc, char **argv)
                fprintf(stderr, "Error allocating a new context\n");
                goto error_td_read;
        }
-       td_write = fmt_write->open_trace(NULL, opt_output_path, O_RDWR, NULL, NULL);
+       td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL);
        if (!td_write) {
                fprintf(stderr, "Error opening trace \"%s\" for writing.\n\n",
                        opt_output_path ? : "<none>");