Cleanup babeltrace-log

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index b320cbb0cd280484e91522b4a4c3357da71461e7..e01e0dbbd047e751cfb97857616e7bddbf5d7a18 100644 (file)
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -45,8 +45,8 @@ static const char metadata_fmt[] =
 "typealias integer { size = 32; align = 32; signed = false; } := uint32_t;\n"
 "\n"
 "trace {\n"
-"      major = %s;\n"                  /* major (e.g. 0) */
-"      minor = %s;\n"                  /* minor (e.g. 1) */
+"      major = %u;\n"                  /* major (e.g. 0) */
+"      minor = %u;\n"                  /* minor (e.g. 1) */
 "      uuid = \"%s\";\n"               /* UUID */
 "      byte_order = %s;\n"             /* be or le */
 "      packet.header := struct {\n"
@@ -78,8 +78,8 @@ void print_metadata(FILE *fp)
 
        uuid_unparse(s_uuid, uuid_str);
        fprintf(fp, metadata_fmt,
-               __stringify(BABELTRACE_VERSION_MAJOR),
-               __stringify(BABELTRACE_VERSION_MINOR),
+               BABELTRACE_VERSION_MAJOR,
+               BABELTRACE_VERSION_MINOR,
                uuid_str,
                BYTE_ORDER == LITTLE_ENDIAN ? "le" : "be");
 }

diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index b4de12f5e973ffcda399545233dae14c12ab6219..fe23fefd7f2730005231ced58fd43a7b59308b42 100644 (file)
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -6,11 +6,6 @@
 #define BABELTRACE_VERSION_MAJOR       0
 #define BABELTRACE_VERSION_MINOR       1
 
-#ifndef __stringify
-#define __stringify_1(a...)    #a
-#define __stringify(a...)      __stringify_1(a)
-#endif
-
 extern int babeltrace_verbose, babeltrace_debug;
 
 #define printf_verbose(fmt, args...)                           \