From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 15 Feb 2011 03:34:52 +0000 (-0500)
Subject: debug printing: cleanup
X-Git-Tag: v0.1~207
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=8e1a0b6f7073b720e7fbf201b571c0d093b78788;hp=fce8006d5eb518bbb036a4b8a2980ad0b981880c

debug printing: cleanup

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

diff --git a/formats/ctf/metadata/ctf-lexer.l b/formats/ctf/metadata/ctf-lexer.l
index 5291d2cc..56122813 100644
--- a/formats/ctf/metadata/ctf-lexer.l
+++ b/formats/ctf/metadata/ctf-lexer.l
@@ -29,8 +29,7 @@ static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
 	__attribute__((unused));
 static int input (yyscan_t yyscanner) __attribute__((unused));
 
-#define printf_dbg(fmt, args...)	fprintf(stderr, "%s: " fmt, __func__, args)
-#define printf_dbg_noarg(fmt)	fprintf(stderr, "%s: " fmt, __func__)
+#define printf_dbg(fmt, args...)	fprintf(stderr, "%s: " fmt, __func__, ##args)
 
 %}
 
diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y
index 38031b00..7847a85d 100644
--- a/formats/ctf/metadata/ctf-parser.y
+++ b/formats/ctf/metadata/ctf-parser.y
@@ -28,8 +28,7 @@
 #include "ctf-parser.h"
 #include "ctf-ast.h"
 
-#define printf_dbg(fmt, args...)	fprintf(stderr, "%s: " fmt, __func__, args)
-#define printf_dbg_noarg(fmt)	fprintf(stderr, "%s: " fmt, __func__)
+#define printf_dbg(fmt, args...)	fprintf(stderr, "%s: " fmt, __func__, ## args)
 
 int yyparse(struct ctf_scanner *scanner);
 int yylex(union YYSTYPE *yyval, struct ctf_scanner *scanner);
@@ -87,7 +86,7 @@ static void push_scope(struct ctf_scanner *scanner)
 {
 	struct ctf_scanner_scope *ns;
 
-	printf_dbg_noarg("push scope\n");
+	printf_dbg("push scope\n");
 	ns = malloc(sizeof(struct ctf_scanner_scope));
 	init_scope(ns, scanner->cs);
 	scanner->cs = ns;
@@ -97,7 +96,7 @@ static void pop_scope(struct ctf_scanner *scanner)
 {
 	struct ctf_scanner_scope *os;
 
-	printf_dbg_noarg("pop scope\n");
+	printf_dbg("pop scope\n");
 	os = scanner->cs;
 	scanner->cs = os->parent;
 	finalize_scope(os);