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

Minor refactoring

This commit is contained in:
Behdad Esfahbod 2015-02-21 16:51:17 +03:00
parent ef79bdf73b
commit 5f541f8f7b
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/hb-private.hh
View File

@ -573,6 +573,30 @@ _hb_debug (unsigned int level,
#define DEBUG_LEVEL_ENABLED(WHAT, LEVEL) (_hb_debug ((LEVEL), HB_DEBUG_##WHAT)) #define DEBUG_LEVEL_ENABLED(WHAT, LEVEL) (_hb_debug ((LEVEL), HB_DEBUG_##WHAT))
#define DEBUG_ENABLED(WHAT) (DEBUG_LEVEL_ENABLED (WHAT, 0)) #define DEBUG_ENABLED(WHAT) (DEBUG_LEVEL_ENABLED (WHAT, 0))
static inline void
_hb_print_func (const char *func)
{
if (func)
{
unsigned int func_len = strlen (func);
/* Skip "static" */
if (0 == strncmp (func, "static ", 7))
func += 7;
/* Skip "typename" */
if (0 == strncmp (func, "typename ", 9))
func += 9;
/* Skip return type */
const char *space = strchr (func, ' ');
if (space)
func = space + 1;
/* Skip parameter list */
const char *paren = strchr (func, '(');
if (paren)
func_len = paren - func;
fprintf (stderr, "%.*s", func_len, func);
}
}
template <int max_level> static inline void template <int max_level> static inline void
_hb_debug_msg_va (const char *what, _hb_debug_msg_va (const char *what,
const void *obj, const void *obj,
@ -618,25 +642,13 @@ _hb_debug_msg_va (const char *what,
} else } else
fprintf (stderr, " " VRBAR LBAR); fprintf (stderr, " " VRBAR LBAR);
if (func) _hb_print_func (func);
{
unsigned int func_len = strlen (func);
/* Skip "typename" */
if (0 == strncmp (func, "typename ", 9))
func += 9;
/* Skip return type */
const char *space = strchr (func, ' ');
if (space)
func = space + 1;
/* Skip parameter list */
const char *paren = strchr (func, '(');
if (paren)
func_len = paren - func;
fprintf (stderr, "%.*s: ", func_len, func);
}
if (message) if (message)
{
fprintf (stderr, ": ");
vfprintf (stderr, message, ap); vfprintf (stderr, message, ap);
}
fprintf (stderr, "\n"); fprintf (stderr, "\n");
} }