Mercurial > dovecot > core-2.2

changeset 19763:c2c77c7759e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doveadm: Code cleanup - Removed passing through unnecessary argv parameter
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Fri, 19 Feb 2016 14:05:13 +0200
parents efc5e383c0c7
children 68b734d7be0d
files src/doveadm/doveadm-mail.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail.c	Thu Feb 18 09:27:10 2016 +0200
+++ b/src/doveadm/doveadm-mail.c	Fri Feb 19 14:05:13 2016 +0200
@@ -417,7 +417,7 @@
 }
 
 static void
-doveadm_mail_all_users(struct doveadm_mail_cmd_context *ctx, char *argv[],
+doveadm_mail_all_users(struct doveadm_mail_cmd_context *ctx,
 		       const char *wildcard_user)
 {
 	struct mail_storage_service_input input;
@@ -436,7 +436,7 @@
         lib_signals_set_handler(SIGINT, 0, sig_die, NULL);
 	lib_signals_set_handler(SIGTERM, 0, sig_die, NULL);
 
-	ctx->v.init(ctx, (const void *)argv);
+	ctx->v.init(ctx, ctx->args);
 
 	mail_storage_service_all_init(ctx->storage_service);
 
@@ -535,7 +535,7 @@
 }
 
 static void
-doveadm_mail_cmd_exec(struct doveadm_mail_cmd_context *ctx, char *argv[],
+doveadm_mail_cmd_exec(struct doveadm_mail_cmd_context *ctx,
 		      const char *wildcard_user)
 {
 	int ret;
@@ -568,7 +568,7 @@
 			i_fatal_status(EX_NOUSER, "User doesn't exist");
 	} else {
 		ctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP;
-		doveadm_mail_all_users(ctx, argv, wildcard_user);
+		doveadm_mail_all_users(ctx, wildcard_user);
 	}
 	if (ctx->search_args != NULL)
 		mail_search_args_unref(&ctx->search_args);
@@ -649,7 +649,7 @@
 			       cmd->name, argv[0]);
 	}
 	ctx->args = (const void *)argv;
-	doveadm_mail_cmd_exec(ctx, argv, wildcard_user);
+	doveadm_mail_cmd_exec(ctx, wildcard_user);
 }
 
 static bool