From: Stephan Bosch Date: Mon, 3 Dec 2018 17:45:35 +0000 (+0100) Subject: lib-smtp: client: Drop smtp_client_command_mail_submit_after(). X-Git-Tag: 2.3.9~1022 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=594e077b3bf5fb2bfd977dab0db1e111dc35226e;p=thirdparty%2Fdovecot%2Fcore.git lib-smtp: client: Drop smtp_client_command_mail_submit_after(). It is not used. --- diff --git a/src/lib-smtp/smtp-client-command.c b/src/lib-smtp/smtp-client-command.c index e1c9484419..82208a0856 100644 --- a/src/lib-smtp/smtp-client-command.c +++ b/src/lib-smtp/smtp-client-command.c @@ -970,12 +970,11 @@ smtp_client_command_rset_submit( /* MAIL FROM: */ -#undef smtp_client_command_mail_submit_after +#undef smtp_client_command_mail_submit struct smtp_client_command * -smtp_client_command_mail_submit_after( +smtp_client_command_mail_submit( struct smtp_client_connection *conn, enum smtp_client_command_flags flags, - struct smtp_client_command *after, const struct smtp_address *from, const struct smtp_params_mail *params, smtp_client_command_callback_t *callback, void *context) @@ -995,23 +994,10 @@ smtp_client_command_mail_submit_after( str_truncate(cmd->data, orig_len); } - smtp_client_command_submit_after(cmd, after); + smtp_client_command_submit(cmd); return cmd; } -#undef smtp_client_command_mail_submit -struct smtp_client_command * -smtp_client_command_mail_submit( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - const struct smtp_address *from, - const struct smtp_params_mail *params, - smtp_client_command_callback_t *callback, void *context) -{ - return smtp_client_command_mail_submit_after - (conn, flags, NULL, from, params, callback, context); -} - /* RCPT TO: */ #undef smtp_client_command_rcpt_submit_after diff --git a/src/lib-smtp/smtp-client-command.h b/src/lib-smtp/smtp-client-command.h index a00dbdf230..6c5a04b4d6 100644 --- a/src/lib-smtp/smtp-client-command.h +++ b/src/lib-smtp/smtp-client-command.h @@ -184,22 +184,6 @@ smtp_client_command_rset_submit( /* send MAIL FROM:
*/ struct smtp_client_command * -smtp_client_command_mail_submit_after( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - struct smtp_client_command *after, - const struct smtp_address *from, - const struct smtp_params_mail *params, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_mail_submit_after(conn, \ - flags, after, address, params, callback, context) \ - smtp_client_command_mail_submit_after(conn, flags + \ - CALLBACK_TYPECHECK(callback, void (*)( \ - const struct smtp_reply *reply, typeof(context))), \ - after, address, params, \ - (smtp_client_command_callback_t *)callback, context) -struct smtp_client_command * smtp_client_command_mail_submit( struct smtp_client_connection *conn, enum smtp_client_command_flags flags,