From: Stephan Bosch Date: Sat, 14 Sep 2019 11:53:59 +0000 (+0200) Subject: lib-smtp: Reformat smtp-client-command.h. X-Git-Tag: 2.3.9~136 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=199b07fa9e17eebab29fb2862d36bd4d600df064;p=thirdparty%2Fdovecot%2Fcore.git lib-smtp: Reformat smtp-client-command.h. --- diff --git a/src/lib-smtp/smtp-client-command.h b/src/lib-smtp/smtp-client-command.h index e723bbb781..7df6ca26d2 100644 --- a/src/lib-smtp/smtp-client-command.h +++ b/src/lib-smtp/smtp-client-command.h @@ -36,8 +36,9 @@ typedef void smtp_client_command_callback_t(const struct smtp_reply *reply, struct smtp_client_command * smtp_client_command_new(struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - smtp_client_command_callback_t *callback, void *context); + enum smtp_client_command_flags flags, + smtp_client_command_callback_t *callback, + void *context); #define smtp_client_command_new(conn, flags, callback, context) \ smtp_client_command_new(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ @@ -51,7 +52,7 @@ smtp_client_command_new(struct smtp_client_connection *conn, the send queue is to be released. */ struct smtp_client_command * smtp_client_command_plug(struct smtp_client_connection *conn, - struct smtp_client_command *after); + struct smtp_client_command *after); void smtp_client_command_ref(struct smtp_client_command *cmd); void smtp_client_command_unref(struct smtp_client_command **_cmd); @@ -74,21 +75,24 @@ void smtp_client_command_write(struct smtp_client_command *cmd, void smtp_client_command_printf(struct smtp_client_command *cmd, const char *cmd_fmt, ...) ATTR_FORMAT(2, 3); void smtp_client_command_vprintf(struct smtp_client_command *cmd, - const char *cmd_fmt, va_list args) ATTR_FORMAT(2, 0); + const char *cmd_fmt, va_list args) + ATTR_FORMAT(2, 0); void smtp_client_command_submit_after(struct smtp_client_command *cmd, - struct smtp_client_command *after); + struct smtp_client_command *after); void smtp_client_command_submit(struct smtp_client_command *cmd); void smtp_client_command_abort(struct smtp_client_command **_cmd); void smtp_client_command_set_abort_callback(struct smtp_client_command *cmd, - void (*callback)(void *context), void *context); + void (*callback)(void *context), + void *context); void smtp_client_command_set_sent_callback(struct smtp_client_command *cmd, - void (*callback)(void *context), void *context); + void (*callback)(void *context), + void *context); void smtp_client_command_set_replies(struct smtp_client_command *cmd, - unsigned int replies); + unsigned int replies); enum smtp_client_command_state smtp_client_command_get_state(struct smtp_client_command *cmd) ATTR_PURE; @@ -100,26 +104,23 @@ smtp_client_command_get_state(struct smtp_client_command *cmd) ATTR_PURE; /* Send NOOP */ struct smtp_client_command * -smtp_client_command_noop_submit_after( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - struct smtp_client_command *after, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_noop_submit_after(conn, \ - flags, after, callback, context) \ +smtp_client_command_noop_submit_after(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + struct smtp_client_command *after, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_noop_submit_after(conn, flags, after, \ + callback, context) \ smtp_client_command_noop_submit_after(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ - const struct smtp_reply *reply, typeof(context))), after, \ - (smtp_client_command_callback_t *)callback, context) + const struct smtp_reply *reply, typeof(context))), \ + after, (smtp_client_command_callback_t *)callback, context) struct smtp_client_command * -smtp_client_command_noop_submit( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_noop_submit(conn, \ - flags, callback, context) \ +smtp_client_command_noop_submit(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_noop_submit(conn, flags, callback, context) \ smtp_client_command_noop_submit(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \ @@ -127,29 +128,26 @@ smtp_client_command_noop_submit( /* Send VRFY */ struct smtp_client_command * -smtp_client_command_vrfy_submit_after( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - struct smtp_client_command *after, - const char *param, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_vrfy_submit_after(conn, \ - flags, after, param, callback, context) \ +smtp_client_command_vrfy_submit_after(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + struct smtp_client_command *after, + const char *param, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_vrfy_submit_after(conn, flags, after, param, \ + callback, context) \ smtp_client_command_vrfy_submit_after(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \ after, param, \ (smtp_client_command_callback_t *)callback, context) struct smtp_client_command * -smtp_client_command_vrfy_submit( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - const char *param, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_vrfy_submit(conn, \ - flags, param, callback, context) \ +smtp_client_command_vrfy_submit(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + const char *param, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_vrfy_submit(conn, flags, param, callback, context) \ smtp_client_command_vrfy_submit(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \ @@ -157,26 +155,23 @@ smtp_client_command_vrfy_submit( /* Send RSET */ struct smtp_client_command * -smtp_client_command_rset_submit_after( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - struct smtp_client_command *after, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_rset_submit_after(conn, \ - flags, after, callback, context) \ +smtp_client_command_rset_submit_after(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + struct smtp_client_command *after, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_rset_submit_after(conn, flags, after, \ + callback, context) \ smtp_client_command_rset_submit_after(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \ after, (smtp_client_command_callback_t *)callback, context) struct smtp_client_command * -smtp_client_command_rset_submit( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_rset_submit(conn, \ - flags, callback, context) \ +smtp_client_command_rset_submit(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_rset_submit(conn, flags, callback, context) \ smtp_client_command_rset_submit(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \ @@ -184,15 +179,14 @@ smtp_client_command_rset_submit( /* Send MAIL FROM:
*/ 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); -#define smtp_client_command_mail_submit(conn, \ - flags, address, params, callback, context) \ +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); +#define smtp_client_command_mail_submit(conn, flags, address, params, \ + callback, context) \ smtp_client_command_mail_submit(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \ @@ -201,31 +195,29 @@ smtp_client_command_mail_submit( /* send RCPT TO:
parameters */ struct smtp_client_command * -smtp_client_command_rcpt_submit_after( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - struct smtp_client_command *after, - const struct smtp_address *to, - const struct smtp_params_rcpt *params, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_rcpt_submit_after(conn, \ - flags, after, to, params, callback, context) \ +smtp_client_command_rcpt_submit_after(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + struct smtp_client_command *after, + const struct smtp_address *to, + const struct smtp_params_rcpt *params, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_rcpt_submit_after(conn, flags, after, to, params, \ + callback, context) \ smtp_client_command_rcpt_submit_after(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \ after, to, params, \ (smtp_client_command_callback_t *)callback, context) struct smtp_client_command * -smtp_client_command_rcpt_submit( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - const struct smtp_address *to, - const struct smtp_params_rcpt *params, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_rcpt_submit(conn, \ - flags, to, params, callback, context) \ +smtp_client_command_rcpt_submit(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + const struct smtp_address *to, + const struct smtp_params_rcpt *params, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_rcpt_submit(conn, flags, to, params, \ + callback, context) \ smtp_client_command_rcpt_submit(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \ @@ -237,28 +229,26 @@ smtp_client_command_rcpt_submit( CRLF line endings consistently is the responsibility of the caller. */ struct smtp_client_command * -smtp_client_command_data_submit_after( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - struct smtp_client_command *after, - struct istream *data, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_data_submit_after(conn, \ - flags, after, data, callback, context) \ +smtp_client_command_data_submit_after(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + struct smtp_client_command *after, + struct istream *data, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_data_submit_after(conn, flags, after, data, \ + callback, context) \ smtp_client_command_data_submit_after(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \ - after, data, (smtp_client_command_callback_t *)callback, context) + after, data, \ + (smtp_client_command_callback_t *)callback, context) struct smtp_client_command * -smtp_client_command_data_submit( - struct smtp_client_connection *conn, - enum smtp_client_command_flags flags, - struct istream *data, - smtp_client_command_callback_t *callback, - void *context); -#define smtp_client_command_data_submit(conn, \ - flags, data, callback, context) \ +smtp_client_command_data_submit(struct smtp_client_connection *conn, + enum smtp_client_command_flags flags, + struct istream *data, + smtp_client_command_callback_t *callback, + void *context); +#define smtp_client_command_data_submit(conn, flags, data, callback, context) \ smtp_client_command_data_submit(conn, flags - \ CALLBACK_TYPECHECK(callback, void (*)( \ const struct smtp_reply *reply, typeof(context))), \