Fix: babeltrace should use output format argument

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index db8c8d65b0e94975f3f9544e122a4845e8af9f2a..fdbedae5bafcb40a300752428a79fc561824dd00 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -58,7 +58,7 @@ static
 void strlower(char *str)
 {
        while (*str) {
-               *str = tolower(*str);
+               *str = tolower((int) *str);
                str++;
        }
 }
@@ -266,7 +266,8 @@ static int parse_options(int argc, char **argv)
                        break;
                case OPT_CLOCK_OFFSET:
                {
-                       char *str, *endptr;
+                       const char *str;
+                       char *endptr;
 
                        str = poptGetOptArg(pc);
                        if (!str) {
@@ -486,7 +487,7 @@ int main(int argc, char **argv)
                }
                strlower(opt_input_format);
        }
-       if (opt_output_format) {
+       if (opt_output_format_arg) {
                opt_output_format = strdup(opt_output_format_arg);
                if (!opt_output_format) {
                        partial_error = 1;