doveadm: Rename doveadm_cmd_*_ver2() to doveadm_cmdline_*()

These are command-line specific functions, and there's no need to clarify
that they're for v2 commands.

diff --git a/src/doveadm/client-connection-tcp.c b/src/doveadm/client-connection-tcp.c
index b80d674dccf2d7a51d9a9499c067f77a9848014d..afe7e1d09056e6f8242aed97464e7da173e4bf75 100644 (file)
--- a/src/doveadm/client-connection-tcp.c
+++ b/src/doveadm/client-connection-tcp.c
@@ -184,7 +184,7 @@ doveadm_cmd_server_run_ver2(struct client_connection_tcp *conn,
                            struct doveadm_cmd_context *cctx)
 {
        i_getopt_reset();
-       if (doveadm_cmd_run_ver2(argc, argv, cctx) < 0)
+       if (doveadm_cmdline_run(argc, argv, cctx) < 0)
                doveadm_exit_code = EX_USAGE;
        doveadm_cmd_server_post(conn, cctx->cmd->name);
 }
@@ -197,7 +197,7 @@ static int doveadm_cmd_handle(struct client_connection_tcp *conn,
        struct ioloop *prev_ioloop = current_ioloop;
        const struct doveadm_cmd_ver2 *cmd_ver2;
 
-       if ((cmd_ver2 = doveadm_cmd_find_with_args_ver2(cmd_name, &argc, &argv)) == NULL) {
+       if ((cmd_ver2 = doveadm_cmdline_find_with_args(cmd_name, &argc, &argv)) == NULL) {
                i_error("doveadm: Client sent unknown command: %s", cmd_name);
                return -1;
        }

diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index 5de976d2c3bb2d17b16a0c32d034b8fa65d11359..9e5f39c586217b87752754e8dd9db4d3f198e245 100644 (file)
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -91,8 +91,8 @@ const struct doveadm_cmd_ver2 *doveadm_cmd_find_ver2(const char *cmd_name)
 }
 
 const struct doveadm_cmd_ver2 *
-doveadm_cmd_find_with_args_ver2(const char *cmd_name, int *argc,
-                               const char *const *argv[])
+doveadm_cmdline_find_with_args(const char *cmd_name, int *argc,
+                              const char *const *argv[])
 {
        int i, k;
        const struct doveadm_cmd_ver2 *cmd;
@@ -349,18 +349,18 @@ doveadm_fill_param(struct doveadm_cmd_param *param,
        }
 }
 
-bool doveadm_cmd_try_run_ver2(const char *cmd_name,
-                             int argc, const char *const argv[],
-                             struct doveadm_cmd_context *cctx)
+bool doveadm_cmdline_try_run(const char *cmd_name,
+                            int argc, const char *const argv[],
+                            struct doveadm_cmd_context *cctx)
 {
        const struct doveadm_cmd_ver2 *cmd;
 
-       cmd = doveadm_cmd_find_with_args_ver2(cmd_name, &argc, &argv);
+       cmd = doveadm_cmdline_find_with_args(cmd_name, &argc, &argv);
        if (cmd == NULL)
                return FALSE;
 
        cctx->cmd = cmd;
-       if (doveadm_cmd_run_ver2(argc, argv, cctx) < 0)
+       if (doveadm_cmdline_run(argc, argv, cctx) < 0)
                doveadm_exit_code = EX_USAGE;
        return TRUE;
 }
@@ -426,8 +426,8 @@ doveadm_cmd_process_options(int argc, const char *const argv[],
        return 0;
 }
 
-int doveadm_cmd_run_ver2(int argc, const char *const argv[],
-                        struct doveadm_cmd_context *cctx)
+int doveadm_cmdline_run(int argc, const char *const argv[],
+                       struct doveadm_cmd_context *cctx)
 {
        ARRAY_TYPE(doveadm_cmd_param_arr_t) pargv;
        unsigned int pargc;

diff --git a/src/doveadm/doveadm-cmd.h b/src/doveadm/doveadm-cmd.h
index a988575e119925e42720d2f647d11849173e31be..2f44f76c903d1eac52ec88a1e9343cd570d1d16b 100644 (file)
--- a/src/doveadm/doveadm-cmd.h
+++ b/src/doveadm/doveadm-cmd.h
@@ -104,16 +104,16 @@ 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_cmdline_find_with_args(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 *const argv[],
-       struct doveadm_cmd_context *cctx);
+bool doveadm_cmdline_try_run(const char *cmd_name,
+                            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 *const argv[],
-       struct doveadm_cmd_context *cctx);
+int doveadm_cmdline_run(int argc, const char *const argv[],
+                       struct doveadm_cmd_context *cctx);
 
 bool doveadm_cmd_param_bool(const struct doveadm_cmd_context *cctx,
                            const char *name, bool *value_r);

diff --git a/src/doveadm/doveadm-mail-batch.c b/src/doveadm/doveadm-mail-batch.c
index 2dbbb891bb21181d6931692f5a4b046280684505..c0a63ef6f027044c4cb20e286f881ea27e00e271 100644 (file)
--- a/src/doveadm/doveadm-mail-batch.c
+++ b/src/doveadm/doveadm-mail-batch.c
@@ -64,7 +64,7 @@ cmd_batch_add(struct batch_cmd_context *batchctx,
        const char *getopt_args;
        int c;
 
-       cmd_ver2 = doveadm_cmd_find_with_args_ver2(argv[0], &argc, &argv);
+       cmd_ver2 = doveadm_cmdline_find_with_args(argv[0], &argc, &argv);
        if (cmd_ver2 == NULL)
                i_fatal_status(EX_USAGE, "doveadm batch: '%s' mail command doesn't exist", argv[0]);
 

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index f175f2c7b5ef8be9e1c9f0d3e9bf47b277cacbfc..a9a147c55fb96d93ad519387353850be226b3368 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -358,7 +358,7 @@ int main(int argc, char *argv[])
           the env pointer */
        cctx.username = getenv("USER");
 
-       if (!doveadm_cmd_try_run_ver2(cmd_name, argc, (const char**)argv, &cctx)) {
+       if (!doveadm_cmdline_try_run(cmd_name, argc, (const char**)argv, &cctx)) {
                if (doveadm_has_subcommands(cmd_name))
                        usage_prefix(cmd_name);
                if (doveadm_has_unloaded_plugin(cmd_name)) {