From 6f4553801729a06e506ffdde7b27c72780d4bb80 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 10 May 2012 23:24:43 +0200 Subject: [PATCH] More massaging trace messaging --- src/hb-open-type-private.hh | 2 +- src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- src/hb-private.hh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index bec78ee..06b7300 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -153,7 +153,7 @@ ASSERT_STATIC (Type::min_size + 1 <= sizeof (_Null##Type)) #define TRACE_SANITIZE() \ - hb_auto_trace_t trace (&c->debug_depth, "SANITIZE", this, NULL, "%s", HB_FUNC); + hb_auto_trace_t trace (&c->debug_depth, "SANITIZE", this, HB_FUNC, ""); struct hb_sanitize_context_t diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index 79fe640..50e4437 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -69,7 +69,7 @@ static inline uint8_t allocate_lig_id (hb_buffer_t *buffer) { #endif #define TRACE_CLOSURE() \ - hb_auto_trace_t trace (&c->debug_depth, "CLOSURE", this, NULL, "%s", HB_FUNC); + hb_auto_trace_t trace (&c->debug_depth, "CLOSURE", this, HB_FUNC, ""); @@ -96,7 +96,7 @@ struct hb_closure_context_t #endif #define TRACE_APPLY() \ - hb_auto_trace_t trace (&c->debug_depth, "APPLY", this, NULL, "%s", HB_FUNC); + hb_auto_trace_t trace (&c->debug_depth, "APPLY", this, HB_FUNC, ""); diff --git a/src/hb-private.hh b/src/hb-private.hh index e02d154..07445c3 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -514,9 +514,9 @@ _hb_debug_msg_va (const char *what, fprintf (stderr, "%s", what) && (obj && fprintf (stderr, "(%p)", obj), TRUE) && fprintf (stderr, ": ") && - (func && fprintf (stderr, "%s: ", func), TRUE) && (indented && fprintf (stderr, "%-*d-> ", level + 1, level), TRUE) && - vfprintf (stderr, message, ap) && + (func && fprintf (stderr, "%s: ", func), TRUE) && + (vfprintf (stderr, message, ap), TRUE) && fprintf (stderr, "\n")); return TRUE; -- 2.7.4