From 00f7fbf0bcce4662bf7e755ecee0517bfebf6ae2 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 12 Aug 2011 15:41:17 -0400
Subject: [PATCH] Babeltrace: print correct version number

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 converter/babeltrace-log.c      | 14 +++++++++-----
 converter/babeltrace.c          |  5 ++---
 include/babeltrace/babeltrace.h |  3 ---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 2b573bde..7f9834c8 100644
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -20,6 +20,7 @@
  * Depends on glibc 2.10 for getline().
  */
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -89,11 +90,16 @@ static
 void print_metadata(FILE *fp)
 {
 	char uuid_str[UUID_STR_LEN];
+	unsigned int major = 0, minor = 0;
+	int ret;
 
+	ret = sscanf(VERSION, "%u.%u", &major, &minor);
+	if (ret != 2)
+		fprintf(stderr, "[warning] Incorrect babeltrace version format\n.");
 	uuid_unparse(s_uuid, uuid_str);
 	fprintf(fp, metadata_fmt,
-		BABELTRACE_VERSION_MAJOR,
-		BABELTRACE_VERSION_MINOR,
+		major,
+		minor,
 		uuid_str,
 		BYTE_ORDER == LITTLE_ENDIAN ? "le" : "be",
 		s_timestamp ? metadata_stream_event_header_timestamp : "");
@@ -245,9 +251,7 @@ void trace_text(FILE *input, int output)
 static
 void usage(FILE *fp)
 {
-	fprintf(fp, "BabelTrace Log Converter %u.%u\n",
-		BABELTRACE_VERSION_MAJOR,
-		BABELTRACE_VERSION_MINOR);
+	fprintf(fp, "BabelTrace Log Converter %s\n", VERSION);
 	fprintf(fp, "\n");
 	fprintf(fp, "Convert for a text log (read from standard input) to CTF.\n");
 	fprintf(fp, "\n");
diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 9d79c39d..ded493ce 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -19,6 +19,7 @@
  */
 
 #define _XOPEN_SOURCE 700
+#include <config.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/format.h>
 #include <popt.h>
@@ -82,9 +83,7 @@ static void list_formats(FILE *fp)
 
 static void usage(FILE *fp)
 {
-	fprintf(fp, "BabelTrace Trace Converter %u.%u\n\n",
-		BABELTRACE_VERSION_MAJOR,
-		BABELTRACE_VERSION_MINOR);
+	fprintf(fp, "BabelTrace Trace Converter %s\n\n", VERSION);
 	fprintf(fp, "usage : babeltrace [OPTIONS] INPUT <OUTPUT>\n");
 	fprintf(fp, "\n");
 	fprintf(fp, "  INPUT                          Input trace path\n");
diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h
index cb28eb79..8091ac44 100644
--- a/include/babeltrace/babeltrace.h
+++ b/include/babeltrace/babeltrace.h
@@ -4,9 +4,6 @@
 #include <stdio.h>
 #include <glib.h>
 
-#define BABELTRACE_VERSION_MAJOR	0
-#define BABELTRACE_VERSION_MINOR	1
-
 extern int babeltrace_verbose, babeltrace_debug;
 
 #define printf_verbose(fmt, args...)				\
-- 
2.34.1