[freetype2-demos] master 600005c: [ftlint] Improve error reporting.

[Werner Lemberg]

branch: master
commit 600005cdef2fd7afede09522e86bb95fa64dd55a
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    [ftlint] Improve error reporting.
    
    * src/ftlint.c (main): Decorate error messages.
    (Error): Take a prefix message argumemt.
---
 ChangeLog    |  7 +++++++
 src/ftlint.c | 25 ++++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eefab76..534f7a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-06-22  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+       [ftlint] Improve error reporting.
+
+       * src/ftlint.c (main): Decorate error messages.
+       (Error): Take a prefix message argumemt.
+
 2021-06-20  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
        * src/ftlint.c (main): Use `ft_basename'.
diff --git a/src/ftlint.c b/src/ftlint.c
index b14a86c..fd75568 100644
--- a/src/ftlint.c
+++ b/src/ftlint.c
@@ -51,7 +51,7 @@
 
 
   static void
-  Error( void )
+  Error( const FT_String  *msg )
   {
     const FT_String  *str;
 
@@ -59,7 +59,7 @@
     switch( error )
     #include <freetype/fterrors.h>
 
-    printf( "  error = 0x%04x, %s\n", error, str );
+    printf( "%serror = 0x%04x, %s\n", msg, error, str );
   }
 
 
@@ -226,7 +226,7 @@
     error = FT_Init_FreeType( &library );
     if ( error )
     {
-      Error();
+      Error( "" );
       exit( 1 );
     }
 
@@ -244,7 +244,7 @@
       error = FT_New_Face( library, fname, face_index, &face );
       if ( error )
       {
-        Error();
+        Error( "  " );
         continue;
       }
 
@@ -254,7 +254,7 @@
       error = FT_Set_Char_Size( face, ptsize << 6, ptsize << 6, 72, 72 );
       if ( error )
       {
-        Error();
+        Error( "  " );
         goto Finalize;
       }
 
@@ -271,8 +271,11 @@
         error = FT_Load_Glyph( face, id, load_flags );
         if ( error )
         {
-          printf( "%5u:", id );
-          Error();
+          if ( !quiet )
+          {
+            printf( "%5u: ", id );
+            Error( "loading " );
+          }
           Fail++;
           continue;
         }
@@ -280,12 +283,12 @@
         if ( quiet )
           continue;
 
-        printf( "%5u:", id );
+        printf( "%5u: ", id );
 
         error = FT_Render_Glyph( face->glyph, render_mode );
         if ( error && error != FT_Err_Cannot_Render_Glyph )
         {
-          Error();
+          Error( "rendering " );
           Fail++;
           continue;
         }
@@ -296,11 +299,11 @@
         error = FT_Bitmap_Convert( library, &face->glyph->bitmap, &bitmap, 1 );
         if ( error )
         {
-          Error();
+          Error( "converting " );
           continue;
         }
         else
-          printf( " %3ux%-4u ", bitmap.width, bitmap.rows );
+          printf( "%3ux%-4u ", bitmap.width, bitmap.rows );
 
         Analyze( &bitmap );
         Checksum( &bitmap );