Mercurial > dovecot > core-2.2
changeset 19824:533b0cebf685
doveadm: Minor code cleanup - rename doveadm_cmd_find*() to doveadm_cmd_find_with_args*()
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Mon, 22 Feb 2016 21:28:24 +0200 |
| parents | 34733f49f6e2 |
| children | e3ea9a323caf |
| files | src/doveadm/client-connection.c src/doveadm/doveadm-cmd.c src/doveadm/doveadm-cmd.h src/doveadm/doveadm.c |
| diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/client-connection.c Mon Feb 22 21:24:06 2016 +0200 +++ b/src/doveadm/client-connection.c Mon Feb 22 21:28:24 2016 +0200 @@ -227,8 +227,8 @@ struct doveadm_mail_cmd_context *ctx; const struct doveadm_cmd_ver2 *cmd_ver2; - if ((cmd_ver2 = doveadm_cmd_find_ver2(cmd_name, argc, (const char**)argv)) == NULL) { - cmd = doveadm_cmd_find(cmd_name, &argc, &argv); + if ((cmd_ver2 = doveadm_cmd_find_with_args_ver2(cmd_name, argc, (const char**)argv)) == NULL) { + cmd = doveadm_cmd_find_with_args(cmd_name, &argc, &argv); if (cmd == NULL) { mail_cmd = doveadm_mail_cmd_find(cmd_name); if (mail_cmd == NULL) {
--- a/src/doveadm/doveadm-cmd.c Mon Feb 22 21:24:06 2016 +0200 +++ b/src/doveadm/doveadm-cmd.c Mon Feb 22 21:28:24 2016 +0200 @@ -48,8 +48,8 @@ array_append(&doveadm_cmds_ver2, cmd, 1); } -const struct doveadm_cmd_ver2* doveadm_cmd_find_ver2(const char *cmd_name, - int argc, const char *argv[]) +const struct doveadm_cmd_ver2 * +doveadm_cmd_find_with_args_ver2(const char *cmd_name, int argc, const char *argv[]) { int i; const struct doveadm_cmd_ver2 *cmd; @@ -117,7 +117,7 @@ } const struct doveadm_cmd * -doveadm_cmd_find(const char *cmd_name, int *argc, char **argv[]) +doveadm_cmd_find_with_args(const char *cmd_name, int *argc, char **argv[]) { const struct doveadm_cmd *cmd, *subcmd; unsigned int cmd_name_len; @@ -354,7 +354,7 @@ { const struct doveadm_cmd_ver2 *cmd; - cmd = doveadm_cmd_find_ver2(cmd_name, argc, argv); + cmd = doveadm_cmd_find_with_args_ver2(cmd_name, argc, argv); if (cmd == NULL) return FALSE;
--- a/src/doveadm/doveadm-cmd.h Mon Feb 22 21:24:06 2016 +0200 +++ b/src/doveadm/doveadm-cmd.h Mon Feb 22 21:28:24 2016 +0200 @@ -77,7 +77,7 @@ void doveadm_register_cmd(const struct doveadm_cmd *cmd); const struct doveadm_cmd * -doveadm_cmd_find(const char *cmd_name, int *argc, char **argv[]); +doveadm_cmd_find_with_args(const char *cmd_name, int *argc, char **argv[]); void doveadm_register_auth_commands(void); void doveadm_register_director_commands(void); @@ -98,8 +98,8 @@ int argc, const struct doveadm_cmd_param argv[]); void doveadm_cmd_register_ver2(struct doveadm_cmd_ver2 *cmd); -const struct doveadm_cmd_ver2 *doveadm_cmd_find_ver2(const char *cmd_name, - int argc, const char *argv[]); +const struct doveadm_cmd_ver2 * +doveadm_cmd_find_with_args_ver2(const char *cmd_name, int argc, const char *argv[]); /* 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[]);
--- a/src/doveadm/doveadm.c Mon Feb 22 21:24:06 2016 +0200 +++ b/src/doveadm/doveadm.c Mon Feb 22 21:28:24 2016 +0200 @@ -210,7 +210,7 @@ { const struct doveadm_cmd *cmd; - cmd = doveadm_cmd_find(cmd_name, &argc, &argv); + cmd = doveadm_cmd_find_with_args(cmd_name, &argc, &argv); if (cmd == NULL) return FALSE; cmd->cmd(argc, argv);