From 24be60b5f160d9aad7366bf3043ec8069664df0b Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 1 Jan 2017 08:20:38 +0100 Subject: [PATCH] */*: Use hex numbers for errors in tracing messages. --- ChangeLog | 4 ++++ src/base/ftobjs.c | 11 +++++++---- src/base/ftoutln.c | 2 +- src/smooth/ftgrays.c | 2 +- src/winfonts/winfnt.c | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index df3626970..2738474b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-12-31 Werner Lemberg + + */*: Use hex numbers for errors in tracing messages. + 2016-12-31 Werner Lemberg [truetype] Check axis count in HVAR table. diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 4f2a9ecdb..2ef1d6ff7 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -462,7 +462,8 @@ Exit: - FT_TRACE4(( "FT_New_GlyphSlot: Return %d\n", error )); + FT_TRACE4(( "FT_New_GlyphSlot: Return 0x%x\n", error )); + return error; } @@ -2031,13 +2032,15 @@ { FT_TRACE3(( "Skip rule %d: darwin vfs resource fork" " is already checked and" - " no font is found\n", i )); + " no font is found\n", + i )); continue; } if ( errors[i] ) { - FT_TRACE3(( "Error[%d] has occurred in rule %d\n", errors[i], i )); + FT_TRACE3(( "Error 0x%x has occurred in rule %d\n", + errors[i], i )); continue; } @@ -2448,7 +2451,7 @@ } #endif - FT_TRACE4(( "FT_Open_Face: Return %d\n", error )); + FT_TRACE4(( "FT_Open_Face: Return 0x%x\n", error )); return error; } diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index fc28225c6..1b799f0c9 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -287,7 +287,7 @@ return FT_Err_Ok; Exit: - FT_TRACE5(( "FT_Outline_Decompose: Error %d\n", error )); + FT_TRACE5(( "FT_Outline_Decompose: Error 0x%x\n", error )); return error; Invalid_Outline: diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index ba42c9ca9..46fd039c6 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -1613,7 +1613,7 @@ typedef ptrdiff_t FT_PtrDist; return 0; Exit: - FT_TRACE5(( "FT_Outline_Decompose: Error %d\n", error )); + FT_TRACE5(( "FT_Outline_Decompose: Error 0x%x\n", error )); return error; Invalid_Outline: diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 99cc96617..2034fd17c 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -561,7 +561,7 @@ error = fnt_font_load( face->font, stream ); if ( error ) { - FT_TRACE2(( "font #%lu load error %d\n", + FT_TRACE2(( "font #%lu load error 0x%x\n", dir_entry2.name, error )); goto Fail; }