Mercurial > dovecot > core-2.2
changeset 19965:9c7f7098fdaf
doveadm: Code cleanup - always use const char *const[] type for argv.
Needed to fix compiler warnings in the following patch.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Tue, 29 Mar 2016 14:06:43 +0300 |
| parents | dd0b73d89761 |
| children | 7dd537c3f6d6 |
| files | src/doveadm/client-connection.c src/doveadm/doveadm-cmd.c src/doveadm/doveadm-cmd.h src/doveadm/doveadm.c |
| diffstat | 4 files changed, 19 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/client-connection.c Tue Mar 29 12:15:05 2016 +0300 +++ b/src/doveadm/client-connection.c Tue Mar 29 14:06:43 2016 +0300 @@ -68,7 +68,7 @@ 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 @@ 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 @@ 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 @@ 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;
--- a/src/doveadm/doveadm-cmd.c Tue Mar 29 12:15:05 2016 +0300 +++ b/src/doveadm/doveadm-cmd.c Tue Mar 29 14:06:43 2016 +0300 @@ -96,10 +96,11 @@ } 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 @@ } 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 @@ } 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 @@ 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;
--- a/src/doveadm/doveadm-cmd.h Tue Mar 29 12:15:05 2016 +0300 +++ b/src/doveadm/doveadm-cmd.h Tue Mar 29 14:06:43 2016 +0300 @@ -96,7 +96,8 @@ 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_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,
--- a/src/doveadm/doveadm.c Tue Mar 29 12:15:05 2016 +0300 +++ b/src/doveadm/doveadm.c Tue Mar 29 14:06:43 2016 +0300 @@ -210,7 +210,8 @@ 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;