From c818559a7af1e5448cc8d3c5823a66e53061191f Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sat, 7 May 2011 13:38:16 -0400 Subject: [PATCH] Cleanup babeltrace-log Signed-off-by: Mathieu Desnoyers --- converter/babeltrace-log.c | 8 ++++---- include/babeltrace/babeltrace.h | 5 ----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c index b320cbb0..e01e0dbb 100644 --- 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 b4de12f5..fe23fefd 100644 --- 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...) \ -- 2.34.1