From 8e1a0b6f7073b720e7fbf201b571c0d093b78788 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 14 Feb 2011 22:34:52 -0500 Subject: [PATCH] debug printing: cleanup Signed-off-by: Mathieu Desnoyers --- formats/ctf/metadata/ctf-lexer.l | 3 +-- formats/ctf/metadata/ctf-parser.y | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) 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); -- 2.34.1