From dbf6a2120c320c4cc58d720fbc60689b09bda46d Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Fri, 28 Sep 2018 13:39:44 +0200 Subject: [PATCH] lib-smtp: client: transaction: Rename mail_from_callback/mail_from_context to mail_callback/mail_context. --- src/lib-smtp/smtp-client-private.h | 4 ++-- src/lib-smtp/smtp-client-transaction.c | 22 +++++++++++----------- src/lib-smtp/smtp-client-transaction.h | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/lib-smtp/smtp-client-private.h b/src/lib-smtp/smtp-client-private.h index 3b6c3086bd..5d575bcba7 100644 --- a/src/lib-smtp/smtp-client-private.h +++ b/src/lib-smtp/smtp-client-private.h @@ -85,8 +85,8 @@ struct smtp_client_transaction { struct smtp_client_command *cmd_plug, *cmd_last; struct smtp_reply *failure; - smtp_client_command_callback_t *mail_from_callback; - void *mail_from_context; + smtp_client_command_callback_t *mail_callback; + void *mail_context; struct smtp_client_transaction_rcpt *rcpts_queue_head, *rcpts_queue_tail; struct smtp_client_transaction_rcpt *rcpts_send; diff --git a/src/lib-smtp/smtp-client-transaction.c b/src/lib-smtp/smtp-client-transaction.c index f80539e644..fd4d022cda 100644 --- a/src/lib-smtp/smtp-client-transaction.c +++ b/src/lib-smtp/smtp-client-transaction.c @@ -368,14 +368,14 @@ void smtp_client_transaction_fail_reply(struct smtp_client_transaction *trans, /* MAIL */ if (trans->cmd_mail_from != NULL) { smtp_client_command_abort(&trans->cmd_mail_from); - if (trans->mail_from_callback != NULL) { - trans->mail_from_callback(reply, - trans->mail_from_context); + if (trans->mail_callback != NULL) { + trans->mail_callback(reply, + trans->mail_context); } } else if (trans->state == SMTP_CLIENT_TRANSACTION_STATE_PENDING) { - if (trans->mail_from_callback != NULL) { - trans->mail_from_callback(reply, - trans->mail_from_context); + if (trans->mail_callback != NULL) { + trans->mail_callback(reply, + trans->mail_context); } } @@ -515,12 +515,12 @@ smtp_client_transaction_mail_cb(const struct smtp_reply *reply, else if (trans->reset) trans->state = SMTP_CLIENT_TRANSACTION_STATE_RESET; - if (trans->mail_from_callback != NULL) { + if (trans->mail_callback != NULL) { enum smtp_client_transaction_state state; struct smtp_client_transaction *tmp_trans = trans; smtp_client_transaction_ref(tmp_trans); - trans->mail_from_callback(reply, trans->mail_from_context); + trans->mail_callback(reply, trans->mail_context); state = trans->state; smtp_client_transaction_unref(&tmp_trans); if (state >= SMTP_CLIENT_TRANSACTION_STATE_FINISHED) @@ -554,7 +554,7 @@ static void smtp_client_transaction_connection_ready( #undef smtp_client_transaction_start void smtp_client_transaction_start( struct smtp_client_transaction *trans, - smtp_client_command_callback_t *mail_from_callback, void *context) + smtp_client_command_callback_t *mail_callback, void *context) { struct smtp_client_connection *conn = trans->conn; @@ -565,8 +565,8 @@ void smtp_client_transaction_start( io_loop_time_refresh(); trans->times.started = ioloop_timeval; - trans->mail_from_callback = mail_from_callback; - trans->mail_from_context = context; + trans->mail_callback = mail_callback; + trans->mail_context = context; trans->state = SMTP_CLIENT_TRANSACTION_STATE_PENDING; diff --git a/src/lib-smtp/smtp-client-transaction.h b/src/lib-smtp/smtp-client-transaction.h index 87fc98abb3..ecc42b696d 100644 --- a/src/lib-smtp/smtp-client-transaction.h +++ b/src/lib-smtp/smtp-client-transaction.h @@ -61,11 +61,11 @@ void smtp_client_transaction_set_timeout(struct smtp_client_transaction *trans, smtp_client_transaction_send() if the transaction wasn't already started. */ void smtp_client_transaction_start(struct smtp_client_transaction *trans, - smtp_client_command_callback_t *mail_from_callback, void *context); -#define smtp_client_transaction_start(trans, mail_from_callback, context) \ + smtp_client_command_callback_t *mail_callback, void *context); +#define smtp_client_transaction_start(trans, mail_callback, context) \ smtp_client_transaction_start(trans, \ - (smtp_client_command_callback_t *)mail_from_callback, \ - context + CALLBACK_TYPECHECK(mail_from_callback, void (*)( \ + (smtp_client_command_callback_t *)mail_callback, \ + context + CALLBACK_TYPECHECK(mail_callback, void (*)( \ const struct smtp_reply *reply, typeof(context)))) /* Add recipient to the transaction with a RCPT TO command. The -- 2.47.3