freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2-demos] master 43d93ff: * src/ftdump.c (Print_Charmaps): Rewor


From: Alexei Podtelezhnikov
Subject: [freetype2-demos] master 43d93ff: * src/ftdump.c (Print_Charmaps): Rework without \b.
Date: Sat, 13 Oct 2018 13:27:57 -0400 (EDT)

branch: master
commit 43d93ffbef893f942cf1da858fd1d92791d02918
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    * src/ftdump.c (Print_Charmaps): Rework without \b.
---
 ChangeLog    |  4 ++++
 src/ftdump.c | 26 +++++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 56974be..dcc8a56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-10-06  Alexei Podtelezhnikov  <address@hidden>
 
+       * src/ftdump.c (Print_Charmaps): Rework without \b.
+
+2018-10-06  Alexei Podtelezhnikov  <address@hidden>
+
        * src/ftcommon.c (FTDemo_String_Draw): Avoid endless loop.
        * src/ftstring.c (main): Don't disable sbits.
 
diff --git a/src/ftdump.c b/src/ftdump.c
index c276a65..3672fe9 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -507,10 +507,12 @@
       }
       else if ( coverage == 1 )
       {
-        FT_ULong   next, last = ~1;
-        FT_UInt    gindex;
-        FT_String  buf[8] = "     ";
-        FT_Char    r = ',';
+        FT_ULong  next, last = ~1;
+        FT_UInt   gindex;
+
+        const char*  f1 = "";
+        const char*  f2 = "     %04lx";
+        const char*  f3;
 
 
         FT_Set_Charmap( face, face->charmaps[i] );
@@ -520,21 +522,23 @@
         {
           if ( next == last + 1 )
           {
-            sprintf( buf + 1, "%04lx,", next );
-            buf[0] = r;
-            r      = '-';
+            f1 = f3;
+            f3 = "-%04lx";
           }
           else
           {
-            printf( "%s%04lx", buf, next );
-            buf[0] = ','; buf[1] = '\0';
-            r      = ',';
+            printf( f1, last );
+            printf( f2, next );
+
+            f1 = "";
+            f2 = f3 = ",%04lx";
           }
 
           last = next;
           next = FT_Get_Next_Char( face, last, &gindex );
         }
-        printf( "%s\b \n", buf );
+        printf( f1, last );
+        printf( "\n" );
       }
     }
   }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]