[freetype2-demos] master 87e52e6: Fix compilation warnings.

[Alexei Podtelezhnikov]

branch: master
commit 87e52e6dc72456b59770a311e97597cba5eadf4e
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    Fix compilation warnings.
    
    * src/ft{lint,dump}.c (main): Null-terminate `strncpy'.
    * src/ttdebug.c (main): Reluctantly ditto.
    
    * src/mlgetopt.c (getopt): Suppress the dropped `const' warning.
---
 ChangeLog      |  9 +++++++++
 src/ftdump.c   | 16 ++++++++--------
 src/ftlint.c   | 16 ++++++++--------
 src/mlgetopt.c |  6 +++---
 src/ttdebug.c  |  2 +-
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f186e55..f08d445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2019-06-11  Alexei Podtelezhnikov  <address@hidden>
+
+       Fix compilation warnings.
+
+       * src/ft{lint,dump}.c (main): Null-terminate `strncpy'.
+       * src/ttdebug.c (main): Reluctantly ditto.
+
+       * src/mlgetopt.c (getopt): Suppress the dropped `const' warning.
+
 2019-06-10  Alexei Podtelezhnikov  <address@hidden>
 
        * src/mlgetopt.c (getopt): Permit merged option-argument pairs.
diff --git a/src/ftdump.c b/src/ftdump.c
index 37fdb2d..3ceed7c 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -833,8 +833,8 @@
         char*  argv[] )
   {
     int    i, file;
-    char   filename[1024 + 4];
-    char   alt_filename[1024 + 4];
+    char   filename[1024];
+    char   alt_filename[1024];
     char*  execname;
     int    num_faces;
     int    option;
@@ -912,11 +912,11 @@
 
     file = 0;
 
-    filename[1024]     = '\0';
-    alt_filename[1024] = '\0';
+    strncpy( filename, argv[file], 1019 );
+    strncpy( alt_filename, argv[file], 1019 );
 
-    strncpy( filename, argv[file], 1024 );
-    strncpy( alt_filename, argv[file], 1024 );
+    filename[1019]     = '\0';
+    alt_filename[1019] = '\0';
 
     /* try to load the file name as is, first */
     error = FT_New_Face( library, argv[file], 0, &face );
@@ -934,8 +934,8 @@
 
     if ( i >= 0 )
     {
-      strncpy( filename + strlen( filename ), ".ttf", 4 );
-      strncpy( alt_filename + strlen( alt_filename ), ".ttc", 4 );
+      strncpy( filename + strlen( filename ), ".ttf", 5 );
+      strncpy( alt_filename + strlen( alt_filename ), ".ttc", 5 );
     }
 #endif
 
diff --git a/src/ftlint.c b/src/ftlint.c
index eb0b456..02bb4e6 100644
--- a/src/ftlint.c
+++ b/src/ftlint.c
@@ -62,8 +62,8 @@
   {
     int           i, file_index;
     unsigned int  id;
-    char          filename[1024 + 4];
-    char          alt_filename[1024 + 4];
+    char          filename[1024];
+    char          alt_filename[1024];
     char*         execname;
     char*         fname;
 
@@ -110,17 +110,17 @@
         i--;
       }
 
-      filename[1024] = '\0';
-      alt_filename[1024] = '\0';
+      strncpy( filename, fname, 1019 );
+      strncpy( alt_filename, fname, 1019 );
 
-      strncpy( filename, fname, 1024 );
-      strncpy( alt_filename, fname, 1024 );
+      filename[1019] = '\0';
+      alt_filename[1019] = '\0';
 
 #ifndef macintosh
       if ( i >= 0 )
       {
-        strncpy( filename + strlen( filename ), ".ttf", 4 );
-        strncpy( alt_filename + strlen( alt_filename ), ".ttc", 4 );
+        strncpy( filename + strlen( filename ), ".ttf", 5 );
+        strncpy( alt_filename + strlen( alt_filename ), ".ttc", 5 );
       }
 #endif
       i     = (int)strlen( filename );
diff --git a/src/mlgetopt.c b/src/mlgetopt.c
index 7d14497..ba85ce7 100644
--- a/src/mlgetopt.c
+++ b/src/mlgetopt.c
@@ -140,9 +140,9 @@
     /*
      *  If the option expects an argument, get it.
      */
-    if ( *(pp + 1) == ':'             &&
-         *(optarg = p + 2) == 0       &&
-         (optarg = av[optind++]) == 0 )
+    if ( *(pp + 1) == ':'              &&
+         *(optarg = (char*)p + 2) == 0 &&
+         (optarg = av[optind++]) == 0  )
     {
       /*
        *  If the option argument is missing, issue a warning and return a '?'.
diff --git a/src/ttdebug.c b/src/ttdebug.c
index 6f62419..9416cd4 100644
--- a/src/ttdebug.c
+++ b/src/ttdebug.c
@@ -2093,7 +2093,7 @@
                              CUR.opcode,
                              Cur_U_Line( &CUR ) );
 
-          strncpy( temp + 46, " (", 2 );
+          strncpy( temp + 46, " (", 3 );
 
           args = CUR.top - 1;
           pop  = Pop_Push_Count[CUR.opcode] >> 4;