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 0ca1313d6746f8c71fdc9caf46584f4894a4043f..f75a7976a9523cbc2b44de83ffb0d50f6bb4d03e 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -546,9 +546,8 @@ static int traverse_dir(const char *fpath, const struct stat *sb,
        } else {
                close(fd);
                close(dirfd);
        } 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);
                if (!td_read) {
                        fprintf(stderr, "Error opening trace \"%s\" "
                                        "for reading.\n\n", fpath);


@@ -634,7 +633,7 @@ int main(int argc, char **argv)
                fprintf(stderr, "Error allocating a new context\n");
                goto error_td_read;
        }
                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>");
        if (!td_write) {
                fprintf(stderr, "Error opening trace \"%s\" for writing.\n\n",
                        opt_output_path ? : "<none>");