Allow signed values in get_signed. Cast unsigned into signed.

[babeltrace.git] / converter / babeltrace-log.c

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 7f9834c8e4cbffef83364b867fa57e744a283189..53826c33ee32e12838e952ac680a5127c41fe985 100644 (file)
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <endian.h>
 
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/types.h>
 
 #define USEC_PER_SEC 1000000UL
@@ -53,6 +53,7 @@ static uuid_t s_uuid;
 
 /* Metadata format string */
 static const char metadata_fmt[] =
+"/* CTF 1.8 */\n"
 "typealias integer { size = 8; align = 8; signed = false; } := uint8_t;\n"
 "typealias integer { size = 32; align = 32; signed = false; } := uint32_t;\n"
 "\n"
@@ -211,7 +212,7 @@ retry:
                write_packet_header(pos, s_uuid);
                write_packet_context(pos);
                if (attempt++ == 1) {
-                       fprintf(stdout, "[Error] Line too large for packet size (%zukB) (discarded)\n",
+                       fprintf(stderr, "[Error] Line too large for packet size (%zukB) (discarded)\n",
                                pos->packet_size / CHAR_BIT / 1024);
                        return;
                }
@@ -293,8 +294,8 @@ int main(int argc, char **argv)
 
        ret = parse_args(argc, argv);
        if (ret) {
-               fprintf(stdout, "Error: invalid argument.\n");
-               usage(stdout);
+               fprintf(stderr, "Error: invalid argument.\n");
+               usage(stderr);
                goto error;
        }