fix const warnings

In particular, in passing argv around as a "const char * const *"
instead of a "const char *".

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 0cd83025a851f866f9cafe6e39a0d2aa997130ed..149668b8cd622b796744a57454d10a0a5ee0cfde 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -163,7 +163,7 @@ reopen_log_file (const char *filename)
 }
 
 static const char*
-getConfigDir (int argc, const char ** argv)
+getConfigDir (int argc, const char * const * argv)
 {
     int c;
     const char * configDir = NULL;

diff --git a/daemon/remote.c b/daemon/remote.c
index 6a11d13e79c409dd542e8e12ed0160e2767e994b..5187ceafede47a590a92b725127b18a4da160f0c 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1834,7 +1834,7 @@ ensure_tset (tr_variant ** tset)
 }
 
 static int
-processArgs (const char * rpcurl, int argc, const char ** argv)
+processArgs (const char * rpcurl, int argc, const char * const * argv)
 {
     int c;
     int status = EXIT_SUCCESS;

diff --git a/libtransmission/tr-getopt.c b/libtransmission/tr-getopt.c
index c2048d072983c7f026199f8a5b320a424ab81215..a5c4d9f51b7a6fc80fdf9db21eee4fb435cade25 100644 (file)
--- a/libtransmission/tr-getopt.c
+++ b/libtransmission/tr-getopt.c
@@ -187,11 +187,11 @@ findOption (const tr_option * opts,
 }
 
 int
-tr_getopt (const char *      usage,
-           int               argc,
-           const char **     argv,
-           const tr_option * opts,
-           const char **     setme_optarg)
+tr_getopt (const char         * usage,
+           int                  argc,
+           const char * const  * argv,
+           const tr_option     * opts,
+           const char         ** setme_optarg)
 {
     int               i;
     const char *      arg = NULL;

diff --git a/libtransmission/tr-getopt.h b/libtransmission/tr-getopt.h
index 4171951cf43ed62bac7ed6d964ee09a34045fde1..5a3e05b156f7ae59e8fcc5b9e13f0289aa23f7c4 100644 (file)
--- a/libtransmission/tr-getopt.h
+++ b/libtransmission/tr-getopt.h
@@ -50,11 +50,11 @@ enum
  * @brief similar to getopt ()
  * @return TR_GETOPT_DONE, TR_GETOPT_ERR, TR_GETOPT_UNK, or the matching tr_option's `val' field
  */
-int  tr_getopt (const char       * summary,
-                int                argc,
-                const char      ** argv,
-                const tr_option  * opts,
-                const char      ** setme_optarg);
+int  tr_getopt (const char          * summary,
+                int                   argc,
+                const char * const  * argv,
+                const tr_option     * opts,
+                const char         ** setme_optarg);
 
 /** @brief prints the `Usage' help section to stdout */
 void tr_getopt_usage (const char       * appName,

diff --git a/utils/create.c b/utils/create.c
index fc03f63ac8cd111cc2806bba0267e3c27a873104..18d3a145aa36c886fd976769800d66190617f5cd 100644 (file)
--- a/utils/create.c
+++ b/utils/create.c
@@ -51,7 +51,7 @@ getUsage (void)
 }
 
 static int
-parseCommandLine (int argc, const char ** argv)
+parseCommandLine (int argc, const char * const * argv)
 {
   int c;
   const char * optarg;

diff --git a/utils/edit.c b/utils/edit.c
index b096cc5304f56a8c2213f503d27fe6154a7dce7b..d7e7a70e634fa8a69d292144928d6a4629cde5af 100644 (file)
--- a/utils/edit.c
+++ b/utils/edit.c
@@ -45,7 +45,7 @@ getUsage (void)
 }
 
 static int
-parseCommandLine (int argc, const char ** argv)
+parseCommandLine (int argc, const char * const * argv)
 {
   int c;
   const char * optarg;

diff --git a/utils/show.c b/utils/show.c
index 77040952e253f729a14553e3b2dc100b9b1c1955..03d343291723bf5534ea308cf7342bbe10c88295 100644 (file)
--- a/utils/show.c
+++ b/utils/show.c
@@ -49,7 +49,7 @@ static bool showVersion = false;
 const char * filename = NULL;
 
 static int
-parseCommandLine (int argc, const char ** argv)
+parseCommandLine (int argc, const char * const * argv)
 {
   int c;
   const char * optarg;