walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More beauty in debug output!

This commit is contained in:
Behdad Esfahbod 2012-05-11 03:33:36 +02:00
parent cf26e88a5a
commit 9659523ca3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-private.hh
View File

@ -610,11 +610,11 @@ _hb_debug_msg<0> (const char *what,
template <int max_level> template <int max_level>
struct hb_auto_trace_t { struct hb_auto_trace_t {
explicit inline hb_auto_trace_t (unsigned int *plevel_, explicit inline hb_auto_trace_t (unsigned int *plevel_,
const char *what, const char *what_,
const void *obj, const void *obj_,
const char *func, const char *func,
const char *message, const char *message,
...) : plevel(plevel_), returned (false) ...) : plevel (plevel_), what (what_), obj (obj_), returned (false)
{ {
if (plevel) ++*plevel; if (plevel) ++*plevel;
@ -627,7 +627,7 @@ struct hb_auto_trace_t {
{ {
if (unlikely (!returned)) { if (unlikely (!returned)) {
fprintf (stderr, "OUCH, returned with no call to TRACE_RETURN. This is a bug, please report. Level was %d.\n", plevel ? *plevel : -1); fprintf (stderr, "OUCH, returned with no call to TRACE_RETURN. This is a bug, please report. Level was %d.\n", plevel ? *plevel : -1);
_hb_debug_msg<max_level> (NULL, NULL, NULL, TRUE, plevel ? *plevel : 1, -1, " "); _hb_debug_msg<max_level> (what, obj, NULL, TRUE, plevel ? *plevel : 1, -1, " ");
return; return;
} }
@ -641,7 +641,7 @@ struct hb_auto_trace_t {
return v; return v;
} }
_hb_debug_msg<max_level> (NULL, NULL, NULL, TRUE, plevel ? *plevel : 1, -1, "return %s", v ? "true" : "false"); _hb_debug_msg<max_level> (what, obj, NULL, TRUE, plevel ? *plevel : 1, -1, "return %s", v ? "true" : "false");
if (plevel) --*plevel; if (plevel) --*plevel;
plevel = NULL; plevel = NULL;
returned = true; returned = true;
@ -651,6 +651,8 @@ struct hb_auto_trace_t {
private: private:
unsigned int *plevel; unsigned int *plevel;
bool returned; bool returned;
const char *what;
const void *obj;
}; };
template <> /* Optimize when tracing is disabled */ template <> /* Optimize when tracing is disabled */
struct hb_auto_trace_t<0> { struct hb_auto_trace_t<0> {