From d523a01fe50c359218e5657b9f2edb8561750205 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sat, 10 Apr 2021 13:19:16 +0200
Subject: [PATCH] lib-sieve: sieve-result - Rename
sieve_result_prepare_action_env() to sieve_action_execution_pre().
---
src/lib-sieve/sieve-result.c | 41 +++++++++++++++++-------------------
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c
index 5cd8ca4a4..4ee6170cf 100644
--- a/src/lib-sieve/sieve-result.c
+++ b/src/lib-sieve/sieve-result.c
@@ -898,8 +898,8 @@ struct sieve_result_execution {
/* Action */
static void
-sieve_result_prepare_action_env(struct sieve_result_execution *rexec,
- struct sieve_action *act)
+sieve_action_execution_pre(struct sieve_result_execution *rexec,
+ struct sieve_action *act)
{
rexec->action_env.action = act;
rexec->action_env.event = act->event;
@@ -1028,7 +1028,7 @@ _sieve_result_implicit_keep(struct sieve_result_execution *rexec,
/* Start keep action */
if (act_keep.def->start != NULL) {
- sieve_result_prepare_action_env(rexec, &act_keep);
+ sieve_action_execution_pre(rexec, &act_keep);
status = act_keep.def->start(aenv, &tr_context);
}
@@ -1041,8 +1041,7 @@ _sieve_result_implicit_keep(struct sieve_result_execution *rexec,
struct sieve_side_effect *sef = &rsef->seffect;
if (sef->def->pre_execute != NULL) {
- sieve_result_prepare_action_env(rexec,
- &act_keep);
+ sieve_action_execution_pre(rexec, &act_keep);
status = sef->def->pre_execute(sef, aenv,
&sef->context,
tr_context);
@@ -1051,7 +1050,7 @@ _sieve_result_implicit_keep(struct sieve_result_execution *rexec,
}
if (status == SIEVE_EXEC_OK && act_keep.def->execute != NULL) {
- sieve_result_prepare_action_env(rexec, &act_keep);
+ sieve_action_execution_pre(rexec, &act_keep);
status = act_keep.def->execute(aenv, tr_context,
&dummy);
}
@@ -1061,8 +1060,7 @@ _sieve_result_implicit_keep(struct sieve_result_execution *rexec,
struct sieve_side_effect *sef = &rsef->seffect;
if (sef->def->post_execute != NULL) {
- sieve_result_prepare_action_env(rexec,
- &act_keep);
+ sieve_action_execution_pre(rexec, &act_keep);
status = sef->def->post_execute(sef, aenv,
tr_context,
&dummy);
@@ -1074,7 +1072,7 @@ _sieve_result_implicit_keep(struct sieve_result_execution *rexec,
/* Commit keep action */
if (status == SIEVE_EXEC_OK) {
if (act_keep.def->commit != NULL) {
- sieve_result_prepare_action_env(rexec, &act_keep);
+ sieve_action_execution_pre(rexec, &act_keep);
status = act_keep.def->commit(aenv, tr_context);
}
@@ -1083,8 +1081,7 @@ _sieve_result_implicit_keep(struct sieve_result_execution *rexec,
struct sieve_side_effect *sef = &rsef->seffect;
if (sef->def->post_commit != NULL) {
- sieve_result_prepare_action_env(rexec,
- &act_keep);
+ sieve_action_execution_pre(rexec, &act_keep);
sef->def->post_commit(sef, aenv, tr_context);
}
rsef = rsef->next;
@@ -1092,7 +1089,7 @@ _sieve_result_implicit_keep(struct sieve_result_execution *rexec,
} else {
/* Failed, rollback */
if (act_keep.def->rollback != NULL) {
- sieve_result_prepare_action_env(rexec, &act_keep);
+ sieve_action_execution_pre(rexec, &act_keep);
act_keep.def->rollback(aenv, tr_context,
(status == SIEVE_EXEC_OK));
}
@@ -1100,7 +1097,7 @@ _sieve_result_implicit_keep(struct sieve_result_execution *rexec,
/* Finish keep action */
if (act_keep.def->finish != NULL) {
- sieve_result_prepare_action_env(rexec, &act_keep);
+ sieve_action_execution_pre(rexec, &act_keep);
act_keep.def->finish(aenv, TRUE, tr_context, status);
}
@@ -1185,7 +1182,7 @@ sieve_result_transaction_start(struct sieve_result_execution *rexec,
}
if (act->def->start != NULL) {
- sieve_result_prepare_action_env(rexec, act);
+ sieve_action_execution_pre(rexec, act);
status = act->def->start(&rexec->action_env,
&rac->tr_context);
rac->success = (status == SIEVE_EXEC_OK);
@@ -1225,7 +1222,7 @@ sieve_result_transaction_execute(struct sieve_result_execution *rexec,
while (status == SIEVE_EXEC_OK && rsef != NULL) {
sef = &rsef->seffect;
if (sef->def != NULL && sef->def->pre_execute != NULL) {
- sieve_result_prepare_action_env(rexec, act);
+ sieve_action_execution_pre(rexec, act);
status = sef->def->pre_execute(
sef, &rexec->action_env,
&sef->context, rac->tr_context);
@@ -1236,7 +1233,7 @@ sieve_result_transaction_execute(struct sieve_result_execution *rexec,
/* Execute the action itself */
if (status == SIEVE_EXEC_OK && act->def != NULL &&
act->def->execute != NULL) {
- sieve_result_prepare_action_env(rexec, act);
+ sieve_action_execution_pre(rexec, act);
status = act->def->execute(&rexec->action_env,
rac->tr_context,
&impl_keep);
@@ -1249,7 +1246,7 @@ sieve_result_transaction_execute(struct sieve_result_execution *rexec,
sef = &rsef->seffect;
if (sef->def != NULL &&
sef->def->post_execute != NULL) {
- sieve_result_prepare_action_env(rexec, act);
+ sieve_action_execution_pre(rexec, act);
status = sef->def->post_execute(
sef, &rexec->action_env,
rac->tr_context, &impl_keep);
@@ -1277,7 +1274,7 @@ sieve_result_action_commit(struct sieve_result_execution *rexec,
int cstatus = SIEVE_EXEC_OK;
if (act->def->commit != NULL) {
- sieve_result_prepare_action_env(rexec, act);
+ sieve_action_execution_pre(rexec, act);
cstatus = act->def->commit(&rexec->action_env,
rac->tr_context);
if (cstatus == SIEVE_EXEC_OK) {
@@ -1294,7 +1291,7 @@ sieve_result_action_commit(struct sieve_result_execution *rexec,
struct sieve_side_effect *sef = &rsef->seffect;
if (sef->def->post_commit != NULL) {
- sieve_result_prepare_action_env(rexec, act);
+ sieve_action_execution_pre(rexec, act);
sef->def->post_commit(
sef, &rexec->action_env,
rac->tr_context);
@@ -1315,7 +1312,7 @@ sieve_result_action_rollback(struct sieve_result_execution *rexec,
struct sieve_result_side_effect *rsef;
if (act->def->rollback != NULL) {
- sieve_result_prepare_action_env(rexec, act);
+ sieve_action_execution_pre(rexec, act);
act->def->rollback(&rexec->action_env, rac->tr_context,
rac->success);
}
@@ -1326,7 +1323,7 @@ sieve_result_action_rollback(struct sieve_result_execution *rexec,
struct sieve_side_effect *sef = &rsef->seffect;
if (sef->def != NULL && sef->def->rollback != NULL) {
- sieve_result_prepare_action_env(rexec, act);
+ sieve_action_execution_pre(rexec, act);
sef->def->rollback(sef, &rexec->action_env,
rac->tr_context, rac->success);
}
@@ -1467,7 +1464,7 @@ sieve_result_transaction_finish(struct sieve_result_execution *rexec, bool last,
}
if (act->def->finish != NULL) {
- sieve_result_prepare_action_env(rexec, act);
+ sieve_action_execution_pre(rexec, act);
act->def->finish(&rexec->action_env, last,
rac->tr_context, status);
}
--
GitLab