[freetype2-demos] master 7d829aa: [ftgrid, ftview, ftstring] Consolidate versioning.

[Alexei Podtelezhnikov]

branch: master
commit 7d829aa748483a3d748026e3b743ae1418cfafaa
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    [ftgrid,ftview,ftstring] Consolidate versioning.
    
    * src/ftcommon.[ch] (FTDemo_Version): New function.
    * src/{ftgrid,ftview,ftstring}.c (parse_cmdline, event_help): Use it.
---
 ChangeLog      |  7 +++++++
 src/ftcommon.c | 18 ++++++++++++++++++
 src/ftcommon.h |  6 ++++++
 src/ftgrid.c   | 20 +++++---------------
 src/ftstring.c | 22 ++++++----------------
 src/ftview.c   | 20 +++++---------------
 6 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a7d13f..3f55f0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-06-01  Alexei Podtelezhnikov  <address@hidden>
+
+       [ftgrid,ftview,ftstring] Consolidate versioning.
+
+       * src/ftcommon.[ch] (FTDemo_Version): New function.
+       * src/{ftgrid,ftview,ftstring}.c (parse_cmdline, event_help): Use it.
+
 2019-05-24  Werner Lemberg  <address@hidden>
 
        [ttdebug] Add option `-d' to select variation font instance.
diff --git a/src/ftcommon.c b/src/ftcommon.c
index fac9c99..4336ea9 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -367,6 +367,24 @@
   }
 
 
+  void
+  FTDemo_Version( FTDemo_Handle*  handle,
+                  FT_String*      str )
+  {
+    FT_Int     major, minor, patch;
+    FT_String  format[] = "%d.%d.%d";
+
+
+    FT_Library_Version( handle->library, &major, &minor, &patch );
+
+    if ( !patch )
+      format[5] = '\0';   /* terminate early */
+
+    /* append the version string */
+    sprintf( str + strlen( str ), format, major, minor, patch );
+  }
+
+
   FT_Error
   FTDemo_Install_Font( FTDemo_Handle*  handle,
                        const char*     filepath,
diff --git a/src/ftcommon.h b/src/ftcommon.h
index 8f3f3e2..e58b8b3 100644
--- a/src/ftcommon.h
+++ b/src/ftcommon.h
@@ -228,6 +228,12 @@
   FTDemo_Done( FTDemo_Handle*  handle );
 
 
+  /* append version information */
+  void
+  FTDemo_Version( FTDemo_Handle*  handle,
+                  FT_String*      str );
+
+
   /* install a font */
   FT_Error
   FTDemo_Install_Font( FTDemo_Handle*  handle,
diff --git a/src/ftgrid.c b/src/ftgrid.c
index a58fa93..2b4dac8 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -864,18 +864,12 @@
   event_help( void )
   {
     char  buf[BUFSIZE];
-    char  version[64];
-
-    const char*  format;
-    FT_Int       major, minor, patch;
+    char  version[64] = "";
 
     grEvent  dummy_event;
 
 
-    FT_Library_Version( handle->library, &major, &minor, &patch );
-
-    format = patch ? "%d.%d.%d" : "%d.%d";
-    sprintf( version, format, major, minor, patch );
+    FTDemo_Version( handle, version );
 
     FTDemo_Display_Clear( display );
     grSetLineHeight( 10 );
@@ -1825,15 +1819,11 @@
 
       case 'v':
         {
-          FT_Int  major, minor, patch;
-
+          FT_String  str[64] = "ftgrid (FreeType) ";
 
-          FT_Library_Version( handle->library, &major, &minor, &patch );
 
-          printf( "ftgrid (FreeType) %d.%d", major, minor );
-          if ( patch )
-            printf( ".%d", patch );
-          printf( "\n" );
+          FTDemo_Version( handle, str );
+          printf( "%s\n", str );
           exit( 0 );
         }
         /* break; */
diff --git a/src/ftstring.c b/src/ftstring.c
index 2e7dd21..10d3a2e 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -183,18 +183,12 @@
   event_help( void )
   {
     char  buf[256];
-    char  version[64];
-
-    const char*  format;
-    FT_Int       major, minor, patch;
+    char  version[64] = "";
 
     grEvent  dummy_event;
 
 
-    FT_Library_Version( handle->library, &major, &minor, &patch );
-
-    format = patch ? "%d.%d.%d" : "%d.%d";
-    sprintf( version, format, major, minor, patch );
+    FTDemo_Version( handle, version );
 
     FTDemo_Display_Clear( display );
     grSetLineHeight( 10 );
@@ -464,7 +458,7 @@
     case grKeyEsc:
     case grKEY( 'q' ):
       ret = 1;
-      goto Exit;;
+      goto Exit;
 
     case grKeyF1:
     case grKEY( '?' ):
@@ -680,15 +674,11 @@
 
       case 'v':
         {
-          FT_Int  major, minor, patch;
-
+          FT_String  str[64] = "ftstring (FreeType) ";
 
-          FT_Library_Version( handle->library, &major, &minor, &patch );
 
-          printf( "ftstring (FreeType) %d.%d", major, minor );
-          if ( patch )
-            printf( ".%d", patch );
-          printf( "\n" );
+          FTDemo_Version( handle, str );
+          printf( "%s\n", str );
           exit( 0 );
         }
         /* break; */
diff --git a/src/ftview.c b/src/ftview.c
index 4bac96c..da6edc0 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -792,18 +792,12 @@
   event_help( void )
   {
     char  buf[256];
-    char  version[64];
-
-    const char*  format;
-    FT_Int       major, minor, patch;
+    char  version[64] = "";
 
     grEvent  dummy_event;
 
 
-    FT_Library_Version( handle->library, &major, &minor, &patch );
-
-    format = patch ? "%d.%d.%d" : "%d.%d";
-    sprintf( version, format, major, minor, patch );
+    FTDemo_Version( handle, version );
 
     FTDemo_Display_Clear( display );
     grSetLineHeight( 10 );
@@ -1909,15 +1903,11 @@
 
       case 'v':
         {
-          FT_Int  major, minor, patch;
-
+          FT_String  str[64] = "ftview (FreeType) ";
 
-          FT_Library_Version( handle->library, &major, &minor, &patch );
 
-          printf( "ftview (FreeType) %d.%d", major, minor );
-          if ( patch )
-            printf( ".%d", patch );
-          printf( "\n" );
+          FTDemo_Version( handle, str );
+          printf( "%s\n", str );
           exit( 0 );
         }
         /* break; */