[freetype2-demos] master 254001a1: * src/*.*: Add const qualifier to the executable basename.

[Werner Lemberg]

branch: master
commit 254001a1cebd5bde48b99c1a1ffe1ebc9695ce9b
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * src/*.*: Add const qualifier to the executable basename.
---
 src/common.c   |  4 ++--
 src/common.h   |  2 +-
 src/ftdump.c   |  7 +++----
 src/ftgrid.c   | 12 +++++-------
 src/ftlint.c   |  4 ++--
 src/ftmulti.c  |  6 ++----
 src/ftsdf.c    |  8 +++-----
 src/ftstring.c |  8 +++-----
 src/ftvalid.c  |  2 +-
 src/ftview.c   |  8 +++-----
 src/ttdebug.c  |  4 ++--
 11 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/src/common.c b/src/common.c
index e830def9..038bf0f1 100644
--- a/src/common.c
+++ b/src/common.c
@@ -8,7 +8,7 @@
 #include <string.h>
 
 
-  char*
+  const char*
   ft_basename( const char*  name )
   {
     const char*  base;
@@ -33,7 +33,7 @@
       c = *current;
     }
 
-    return (char*)base;
+    return base;
   }
 
 
diff --git a/src/common.h b/src/common.h
index 39f48980..070bf548 100644
--- a/src/common.h
+++ b/src/common.h
@@ -7,7 +7,7 @@
 #endif
 
 
-  extern char*
+  extern const char*
   ft_basename( const char*  name );
 
   /* print a message and exit */
diff --git a/src/ftdump.c b/src/ftdump.c
index 0ab548e9..c91116a0 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -96,8 +96,8 @@
 
 
   static void
-  usage( FT_Library  library,
-         char*       execname )
+  usage( FT_Library   library,
+         const char*  execname )
   {
     FT_Done_FreeType( library );
 
@@ -1170,15 +1170,14 @@
   {
     int    i, file;
     char   filename[1024];
-    char*  execname;
     int    num_faces;
     int    option;
 
     FT_Library  library;      /* the FreeType library */
     FT_Face     face;         /* the font face        */
 
+    const char*  execname = ft_basename( argv[0] );
 
-    execname = ft_basename( argv[0] );
 
     /* Initialize engine */
     error = FT_Init_FreeType( &library );
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 119e838e..cb3494b7 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -1660,7 +1660,7 @@
 
 
   static void
-  usage( char*  execname )
+  usage( const char*  execname )
   {
     fprintf( stderr,
       "\n"
@@ -1708,14 +1708,12 @@
   parse_cmdline( int*    argc,
                  char**  argv[] )
   {
-    char*  execname;
-    int    option;
-    int    have_encoding = 0;
-    int    have_index    = 0;
+    int          option;
+    int          have_encoding = 0;
+    int          have_index    = 0;
+    const char*  execname = ft_basename( (*argv)[0] );
 
 
-    execname = ft_basename( (*argv)[0] );
-
     while ( 1 )
     {
       option = getopt( *argc, *argv, "a:d:e:f:k:nr:v" );
diff --git a/src/ftlint.c b/src/ftlint.c
index bc559f2c..21ef1db9 100644
--- a/src/ftlint.c
+++ b/src/ftlint.c
@@ -64,7 +64,7 @@
 
 
   static void
-  Usage( char*  name )
+  Usage( const char*  name )
   {
     printf( "ftlint: simple font tester -- part of the FreeType project\n" );
     printf( "----------------------------------------------------------\n" );
@@ -158,7 +158,7 @@
         char**  argv )
   {
     int           file_index, face_index;
-    char*         execname;
+    const char*   execname;
     char*         fname;
     int           opt;
     unsigned int  first_index = 0;
diff --git a/src/ftmulti.c b/src/ftmulti.c
index 112bda90..c09cecf0 100644
--- a/src/ftmulti.c
+++ b/src/ftmulti.c
@@ -889,7 +889,7 @@
 
 
   static void
-  usage( char*  execname )
+  usage( const char*  execname )
   {
     fprintf( stderr,
       "\n"
@@ -936,7 +936,6 @@
     int    old_ptsize, orig_ptsize, file;
     int    first_glyph = 0;
     int    XisSetup = 0;
-    char*  execname;
     int    option;
     int    file_loaded;
 
@@ -946,10 +945,9 @@
     unsigned int  versions[3] = { TT_INTERPRETER_VERSION_35,
                                   TT_INTERPRETER_VERSION_38,
                                   TT_INTERPRETER_VERSION_40 };
+    const char*   execname = ft_basename( argv[0] );
 
 
-    execname = ft_basename( argv[0] );
-
     /* Initialize engine */
     error = FT_Init_FreeType( &library );
     if ( error )
diff --git a/src/ftsdf.c b/src/ftsdf.c
index 002fa0c4..975927de 100644
--- a/src/ftsdf.c
+++ b/src/ftsdf.c
@@ -660,7 +660,7 @@
 
 
   static void
-  usage( char*  exec_name )
+  usage( const char*  exec_name )
   {
     fprintf( stderr,
       "\n"
@@ -684,14 +684,12 @@
   main( int     argc,
         char**  argv )
   {
-    FT_Error  err       = FT_Err_Ok;
-    char*     exec_name = NULL;
+    FT_Error     err       = FT_Err_Ok;
+    const char*  exec_name = ft_basename( argv[0] );
 
     int  flip_y = 1;
 
 
-    exec_name = ft_basename( argv[0] );
-
     if ( argc != 3 )
       usage( exec_name );
 
diff --git a/src/ftstring.c b/src/ftstring.c
index c6eeb622..bb70d33a 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -656,7 +656,7 @@
 
 
   static void
-  usage( char*  execname )
+  usage( const char*  execname )
   {
     fprintf( stderr,
       "\n"
@@ -700,12 +700,10 @@
   parse_cmdline( int*     argc,
                  char***  argv )
   {
-    char*  execname;
-    int    option;
+    int          option;
+    const char*  execname = ft_basename( (*argv)[0] );
 
 
-    execname = ft_basename( (*argv)[0] );
-
     while ( 1 )
     {
       option = getopt( *argc, *argv, "d:e:k:m:r:v" );
diff --git a/src/ftvalid.c b/src/ftvalid.c
index ac5f1cb5..99feb3e7 100644
--- a/src/ftvalid.c
+++ b/src/ftvalid.c
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 
 
-  static char*  execname;
+  static const char*  execname;
 
   typedef enum
   {
diff --git a/src/ftview.c b/src/ftview.c
index 0d1abbf0..31582a51 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -1637,7 +1637,7 @@
 
 
   static void
-  usage( char*  execname )
+  usage( const char*  execname )
   {
     fprintf( stderr,
       "\n"
@@ -1688,12 +1688,10 @@
   parse_cmdline( int*    argc,
                  char**  argv[] )
   {
-    char*  execname;
-    int    option;
+    int          option;
+    const char*  execname = ft_basename( (*argv)[0] );
 
 
-    execname = ft_basename( (*argv)[0] );
-
     while ( 1 )
     {
       option = getopt( *argc, *argv, "d:e:f:k:L:l:m:pr:v" );
diff --git a/src/ttdebug.c b/src/ttdebug.c
index d8911617..19b38c83 100644
--- a/src/ttdebug.c
+++ b/src/ttdebug.c
@@ -2854,7 +2854,7 @@
 
 
   static void
-  Usage( char*  execname )
+  Usage( const char*  execname )
   {
     char  versions[32];
 
@@ -2911,11 +2911,11 @@
   main( int     argc,
         char**  argv )
   {
-    char*  execname;
     int    option;
     char   version_string[64];
 
     int           i;
+    const char*   execname;
     unsigned int  versions[3] = { TT_INTERPRETER_VERSION_35,
                                   TT_INTERPRETER_VERSION_38,
                                   TT_INTERPRETER_VERSION_40 };