X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=cc7eabc40264b61324e47099f7d5d7e9f6f2d178;hp=c0c6541af5b41b6085593b5c09605460809b101b;hb=6faba941d4831337f470e9a0725524793f51f61b;hpb=478b63899006dac8f96cca441b48e4fc177adbe8

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index c0c6541a..cc7eabc4 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -164,20 +164,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 ? : "<autodetect>");
+		opt_input_format ? : "ctf <default>");
 	printf_verbose("Converting to file: %s\n",
 		opt_output_path ? : "<stdout>");
 	printf_verbose("Converting to format: %s\n",
-		opt_output_format ? : "ctf");
+		opt_output_format ? : "text <default>");
 
-	if (!opt_input_format) {
-		fprintf(stdout, "Error: input format autodetection not implemented yet.\n\n");
-		usage(stdout);
-		exit(EXIT_FAILURE);
-	}
+	if (!opt_input_format)
+		opt_input_format = "ctf";
+	if (!opt_output_format)
+		opt_output_format = "text";
 	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);
 	}
@@ -185,24 +184,22 @@ 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",
-			opt_output_path);
+			opt_output_path ? : "<none>");
 		goto error_td_write;
 	}