doveadm: Minor code cleanup - rename doveadm_cmd_find*() to doveadm_cmd_find_with_args*()

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index 3797f6adda58226082aa79b131b594a216f0840f..ccc6e2dd54bfe762e4e3560c8e894cc275b09e94 100644 (file)
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -227,8 +227,8 @@ static int doveadm_cmd_handle(struct client_connection *conn,
        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) {

diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index e9ad8ea57b372a39a10306747603b3c9122b2914..b7ad8298f41f050728f02515c15f333e51e9ca40 100644 (file)
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -48,8 +48,8 @@ void doveadm_cmd_register_ver2(struct doveadm_cmd_ver2 *cmd)
        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 @@ doveadm_cmd_find_multi_word(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[])
 {
        const struct doveadm_cmd *cmd, *subcmd;
        unsigned int cmd_name_len;
@@ -354,7 +354,7 @@ bool doveadm_cmd_try_run_ver2(const char *cmd_name, int argc, const char *argv[]
 {
        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;
 

diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index 9b368d7fa01192eeba60869261cf1e5b86dd9552..7e9498218f530090d43ed4880aedb6a9731e25ee 100644 (file)
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -77,7 +77,7 @@ extern struct doveadm_cmd doveadm_cmd_zlibconnect;
 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 doveadm_cmd_ver2_to_mail_cmd_wrapper(const struct doveadm_cmd_ver2* cmd,
        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[]);

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 4eef1456cef68d2e9f50bca9caf0cf4fd6cd9ab2..a75984680d45491324eb8dcfe3e5ff91be559a03 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -210,7 +210,7 @@ static bool doveadm_try_run(const char *cmd_name, int argc, char *argv[])
 {
        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);