X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=c888ec60dc05f71cbf4142ad1c270e0980043021;hp=70e43ccf7af67f197d3fc36057a82d679f6d6e9e;hb=c8b219a3168dd382a167a72406e268550005e662;hpb=847bf71a4af4770390a59e8ef8e1fdfca33687b9 diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 70e43ccf..c888ec60 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -133,10 +133,6 @@ static int parse_options(int argc, char **argv) goto end; } opt_output_path = poptGetArg(pc); - if (!opt_output_path) { - ret = -EINVAL; - goto end; - } end: if (pc) { poptFreeContext(pc); @@ -169,18 +165,19 @@ int main(int argc, char **argv) printf_verbose("Converting from file: %s\n", opt_input_path); printf_verbose("Converting from format: %s\n", opt_input_format ? : ""); - printf_verbose("Converting to file: %s\n", opt_output_path); + printf_verbose("Converting to file: %s\n", + opt_output_path ? : ""); printf_verbose("Converting to format: %s\n", opt_output_format ? : "ctf"); if (!opt_input_format) { - fprintf(stdout, "Error: input format autodetection not implemented yet.\n\n"); + fprintf(stdout, "[error] Input format autodetection not implemented yet.\n\n"); usage(stdout); exit(EXIT_FAILURE); } fmt_read = bt_lookup_format(g_quark_from_static_string(opt_input_format)); if (!fmt_read) { - fprintf(stdout, "Error: format \"%s\" is not supported.\n\n", + fprintf(stdout, "[error] Format \"%s\" is not supported.\n\n", opt_input_format); exit(EXIT_FAILURE); } @@ -188,18 +185,20 @@ int main(int argc, char **argv) opt_output_format = "ctf"; fmt_write = bt_lookup_format(g_quark_from_static_string(opt_output_format)); if (!fmt_write) { - fprintf(stdout, "Error: format \"%s\" is not supported.\n\n", + fprintf(stdout, "[error] format \"%s\" is not supported.\n\n", opt_output_format); exit(EXIT_FAILURE); } td_read = fmt_read->open_trace(opt_input_path, O_RDONLY); if (!td_read) { - fprintf(stdout, "Error opening trace \"%s\" for reading.\n\n", + fprintf(stdout, "[error] opening trace \"%s\" for reading.\n\n", opt_input_path); goto error_td_read; } + if (!opt_output_path) + opt_output_path = "/dev/stdout"; td_write = fmt_write->open_trace(opt_output_path, O_WRONLY); if (!td_write) { fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",