doveadm: Code cleanup - always use const char *const[] type for argv.

Needed to fix compiler warnings in the following patch.

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index ac78acd43260f8767a4a3424d861af8016083316..f96e2540a88050a5c725865a64a0d72222a5ac5c 100644 (file)
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -68,7 +68,7 @@ doveadm_cmd_server_post(struct client_connection *conn, const char *cmd_name)
 
 static void
 doveadm_cmd_server_run_ver2(struct client_connection *conn,
-                           int argc, const char **argv,
+                           int argc, const char *const argv[],
                            struct doveadm_cmd_context *cctx)
 {
        i_getopt_reset();
@@ -80,7 +80,7 @@ doveadm_cmd_server_run_ver2(struct client_connection *conn,
 
 static void
 doveadm_cmd_server_run(struct client_connection *conn,
-                      int argc, const char **argv,
+                      int argc, const char *const argv[],
                       const struct doveadm_cmd *cmd)
 {
        i_getopt_reset();
@@ -92,7 +92,7 @@ doveadm_cmd_server_run(struct client_connection *conn,
 static int
 doveadm_mail_cmd_server_parse(const struct doveadm_mail_cmd *cmd,
                              const struct doveadm_settings *set,
-                             int argc, const char **argv,
+                             int argc, const char *const argv[],
                              struct doveadm_cmd_context *cctx,
                              struct doveadm_mail_cmd_context **mctx_r)
 {
@@ -225,7 +225,7 @@ bool doveadm_client_is_allowed_command(const struct doveadm_settings *set,
 
 static int doveadm_cmd_handle(struct client_connection *conn,
                              const char *cmd_name,
-                             int argc, const char **argv,
+                             int argc, const char *const argv[],
                              struct doveadm_cmd_context *cctx)
 {
        struct ioloop *ioloop, *prev_ioloop = current_ioloop;

diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index 559af1aebdbbebca0dba464730563151538c1ab9..401386a0810fc96ab455ea529535d46451d90f50 100644 (file)
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -96,10 +96,11 @@ doveadm_cmd_find_with_args_ver2(const char *cmd_name, int argc, const char *cons
 }
 
 static bool
-doveadm_cmd_find_multi_word(const char *cmdname, int *_argc, const char **_argv[])
+doveadm_cmd_find_multi_word(const char *cmdname, int *_argc,
+                           const char *const *_argv[])
 {
        int argc = *_argc;
-       const char **argv = *_argv;
+       const char *const *argv = *_argv;
        unsigned int len;
 
        if (argc < 2)
@@ -126,7 +127,8 @@ doveadm_cmd_find_multi_word(const char *cmdname, int *_argc, const char **_argv[
 }
 
 const struct doveadm_cmd *
-doveadm_cmd_find_with_args(const char *cmd_name, int *argc, const char **argv[])
+doveadm_cmd_find_with_args(const char *cmd_name, int *argc,
+                          const char *const *argv[])
 {
        const struct doveadm_cmd *cmd;
        unsigned int cmd_name_len;
@@ -425,7 +427,7 @@ static void doveadm_fill_param(struct doveadm_cmd_param *param,
 }
 
 bool doveadm_cmd_try_run_ver2(const char *cmd_name,
-                             int argc, const char **argv,
+                             int argc, const char *const argv[],
                              struct doveadm_cmd_context *cctx)
 {
        const struct doveadm_cmd_ver2 *cmd;
@@ -440,7 +442,7 @@ bool doveadm_cmd_try_run_ver2(const char *cmd_name,
        return TRUE;
 }
 
-int doveadm_cmd_run_ver2(int argc, const char **argv,
+int doveadm_cmd_run_ver2(int argc, const char *const argv[],
                         struct doveadm_cmd_context *cctx)
 {
        struct doveadm_cmd_param *param;

diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index 974d87ff6eac8a2d389b91118b328a5cc5b85e7f..e4ec4791cd04e0c496ac13ce1e85ded23b16e8c2 100644 (file)
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -96,7 +96,8 @@ extern struct doveadm_cmd doveadm_cmd_zlibconnect;
 void doveadm_register_cmd(const struct doveadm_cmd *cmd);
 
 const struct doveadm_cmd *
-doveadm_cmd_find_with_args(const char *cmd_name, int *argc, const char **argv[]);
+doveadm_cmd_find_with_args(const char *cmd_name, int *argc,
+                          const char *const *argv[]);
 
 void doveadm_register_auth_commands(void);
 void doveadm_register_director_commands(void);
@@ -116,14 +117,15 @@ void doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx);
 
 void doveadm_cmd_register_ver2(struct doveadm_cmd_ver2 *cmd);
 const struct doveadm_cmd_ver2 *
-doveadm_cmd_find_with_args_ver2(const char *cmd_name, int argc, const char *const argv[]);
+doveadm_cmd_find_with_args_ver2(const char *cmd_name, int argc,
+                               const char *const argv[]);
 const struct doveadm_cmd_ver2 *doveadm_cmd_find_ver2(const char *cmd_name);
 /* Returns FALSE if cmd_name doesn't exist, TRUE if it exists. */
 bool doveadm_cmd_try_run_ver2(const char *cmd_name,
-       int argc, const char **argv,
+       int argc, const char *const argv[],
        struct doveadm_cmd_context *cctx);
 /* Returns 0 if success, -1 if parameters were invalid. */
-int doveadm_cmd_run_ver2(int argc, const char **argv,
+int doveadm_cmd_run_ver2(int argc, const char *const argv[],
        struct doveadm_cmd_context *cctx);
 
 bool doveadm_cmd_param_bool(const struct doveadm_cmd_context *cctx,

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 2f02920e755b7225f8034cb56091cd3372245932..677047e008329cd303023a6fac9e259c79626436 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -210,7 +210,8 @@ static void cmd_exec(int argc ATTR_UNUSED, char *argv[])
        i_fatal("execv(%s) failed: %m", argv[0]);
 }
 
-static bool doveadm_try_run(const char *cmd_name, int argc, const char *argv[])
+static bool doveadm_try_run(const char *cmd_name, int argc,
+                           const char *const argv[])
 {
        const struct doveadm_cmd *cmd;