From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Tue, 10 Oct 2017 17:04:20 +0000 (+0200)
Subject: doveadm: mail: Removed struct doveadm_cmd_context function parameters that are now... 
X-Git-Tag: 2.3.0.rc1~771
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a435fb28fa05a589e40be2c313bd798f14846d06;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: mail: Removed struct doveadm_cmd_context function parameters that are now useless.

It can be accessed from struct doveadm_mail_cmd_context.
---

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index 0641a6d5e8..560e8352e3 100644
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -232,8 +232,7 @@ doveadm_mail_cmd_server_parse(const struct doveadm_mail_cmd *cmd,
 
 static void
 doveadm_mail_cmd_server_run(struct client_connection *conn,
-			    struct doveadm_mail_cmd_context *mctx,
-			    struct doveadm_cmd_context *cctx)
+			    struct doveadm_mail_cmd_context *mctx)
 {
 	const char *error;
 	int ret;
@@ -243,7 +242,7 @@ doveadm_mail_cmd_server_run(struct client_connection *conn,
 	if (mctx->v.preinit != NULL)
 		mctx->v.preinit(mctx);
 
-	ret = doveadm_mail_single_user(mctx, cctx, &error);
+	ret = doveadm_mail_single_user(mctx, &error);
 	doveadm_mail_server_flush();
 	mctx->v.deinit(mctx);
 	doveadm_print_flush();
@@ -325,7 +324,7 @@ static int doveadm_cmd_handle(struct client_connection *conn,
 	else if (cmd != NULL)
 		doveadm_cmd_server_run(conn, argc, argv, cmd);
 	else
-		doveadm_mail_cmd_server_run(conn, mctx, cctx);
+		doveadm_mail_cmd_server_run(conn, mctx);
 
 	io_loop_set_current(prev_ioloop);
 	o_stream_switch_ioloop(conn->output);
diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 3551a32db6..09d7863c4c 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -380,13 +380,15 @@ doveadm_cctx_to_storage_service_input(const struct doveadm_cmd_context *cctx,
 
 static int
 doveadm_mail_next_user(struct doveadm_mail_cmd_context *ctx,
-		       const struct doveadm_cmd_context *cctx,
 		       const char **error_r)
 {
+	const struct doveadm_cmd_context *cctx = ctx->cctx;
 	struct mail_storage_service_input input;
 	const char *error, *ip;
 	int ret;
 
+	i_assert(cctx != NULL);
+
 	ip = net_ip2addr(&cctx->remote_ip);
 	if (ip[0] == '\0')
 		i_set_failure_prefix("doveadm(%s): ", cctx->username);
@@ -441,9 +443,10 @@ static void sig_die(const siginfo_t *si, void *context ATTR_UNUSED)
 }
 
 int doveadm_mail_single_user(struct doveadm_mail_cmd_context *ctx,
-			     const struct doveadm_cmd_context *cctx,
 			     const char **error_r)
 {
+	const struct doveadm_cmd_context *cctx = ctx->cctx;
+
 	i_assert(cctx->username != NULL);
 
 	doveadm_cctx_to_storage_service_input(cctx, &ctx->storage_service_input);
@@ -458,14 +461,14 @@ int doveadm_mail_single_user(struct doveadm_mail_cmd_context *ctx,
 	lib_signals_set_handler(SIGINT, 0, sig_die, NULL);
 	lib_signals_set_handler(SIGTERM, 0, sig_die, NULL);
 
-	return doveadm_mail_next_user(ctx, cctx, error_r);
+	return doveadm_mail_next_user(ctx, error_r);
 }
 
 static void
 doveadm_mail_all_users(struct doveadm_mail_cmd_context *ctx,
-		       struct doveadm_cmd_context *cctx,
 		       const char *wildcard_user)
 {
+	struct doveadm_cmd_context *cctx = ctx->cctx;
 	unsigned int user_idx;
 	const char *ip, *user, *error;
 	int ret;
@@ -496,7 +499,7 @@ doveadm_mail_all_users(struct doveadm_mail_cmd_context *ctx,
 		ctx->cur_username = user;
 		doveadm_print_sticky("username", user);
 		T_BEGIN {
-			ret = doveadm_mail_next_user(ctx, cctx, &error);
+			ret = doveadm_mail_next_user(ctx, &error);
 			if (ret < 0)
 				i_error("%s", error);
 			else if (ret == 0)
@@ -591,9 +594,9 @@ doveadm_mail_cmdline_init(const struct doveadm_mail_cmd *cmd)
 
 static void
 doveadm_mail_cmd_exec(struct doveadm_mail_cmd_context *ctx,
-		      struct doveadm_cmd_context *cctx,
 		      const char *wildcard_user)
 {
+	const struct doveadm_cmd_context *cctx = ctx->cctx;
 	bool cli = (cctx->conn_type == CLIENT_CONNECTION_TYPE_CLI);
 	int ret;
 	const char *error;
@@ -620,7 +623,7 @@ doveadm_mail_cmd_exec(struct doveadm_mail_cmd_context *ctx,
 
 		if (ctx->add_username_header)
 			doveadm_print_sticky("username", cctx->username);
-		ret = doveadm_mail_single_user(ctx, cctx, &error);
+		ret = doveadm_mail_single_user(ctx, &error);
 		if (ret < 0) {
 			/* user lookup/init failed somehow */
 			doveadm_exit_code = EX_TEMPFAIL;
@@ -631,7 +634,7 @@ doveadm_mail_cmd_exec(struct doveadm_mail_cmd_context *ctx,
 		}
 	} else {
 		ctx->service_flags |= MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP;
-		doveadm_mail_all_users(ctx, cctx, wildcard_user);
+		doveadm_mail_all_users(ctx, wildcard_user);
 	}
 	if (ctx->search_args != NULL)
 		mail_search_args_unref(&ctx->search_args);
@@ -716,7 +719,7 @@ doveadm_mail_cmd(const struct doveadm_mail_cmd *cmd, int argc, char *argv[])
 	}
 	ctx->args = (const void *)argv;
 	cctx.username = ctx->cur_username;
-	doveadm_mail_cmd_exec(ctx, &cctx, wildcard_user);
+	doveadm_mail_cmd_exec(ctx, wildcard_user);
 	doveadm_mail_cmd_free(ctx);
 }
 
@@ -1093,6 +1096,6 @@ doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx)
 	mctx->args = array_idx(&full_args, args_pos);
 	mctx->full_args = array_idx(&full_args, 0);
 
-	doveadm_mail_cmd_exec(mctx, cctx, wildcard_user);
+	doveadm_mail_cmd_exec(mctx, wildcard_user);
 	doveadm_mail_cmd_free(mctx);
 }
diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index f28bdaa91a..ca56733d78 100644
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -135,7 +135,6 @@ struct doveadm_mail_cmd_context *
 doveadm_mail_cmd_init(const struct doveadm_mail_cmd *cmd,
 		      const struct doveadm_settings *set);
 int doveadm_mail_single_user(struct doveadm_mail_cmd_context *ctx,
-			     const struct doveadm_cmd_context *cctx,
 			     const char **error_r);
 int doveadm_mail_server_user(struct doveadm_mail_cmd_context *ctx,
 			     const struct mail_storage_service_input *input,