diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-07-23 12:53:08 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-07-23 12:53:08 +0100 |
| commit | fe79d8c5a39f2b717f78cc3f3ef21b3cfc46500b (patch) | |
| tree | c84e6a5d4c5cd78a7a2cc3c7adbc7af5d0541682 /src/libmime/smtp_proto.h | |
| parent | e0483657ff6cf1adc828ccce457814d61fe90a0d (diff) | |
| download | rspamd-fe79d8c5a39f2b717f78cc3f3ef21b3cfc46500b.tar.gz rspamd-fe79d8c5a39f2b717f78cc3f3ef21b3cfc46500b.zip | |
Revert "Unify code style."
This reverts commit e0483657ff6cf1adc828ccce457814d61fe90a0d.
Diffstat (limited to 'src/libmime/smtp_proto.h')
| -rw-r--r-- | src/libmime/smtp_proto.h | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/libmime/smtp_proto.h b/src/libmime/smtp_proto.h index 7c5787926..42fecd255 100644 --- a/src/libmime/smtp_proto.h +++ b/src/libmime/smtp_proto.h @@ -6,14 +6,12 @@ /* SMTP errors */ #define SMTP_ERROR_BAD_COMMAND "500 Syntax error, command unrecognized" CRLF -#define SMTP_ERROR_BAD_ARGUMENTS "501 Syntax error in parameters or arguments" \ - CRLF +#define SMTP_ERROR_BAD_ARGUMENTS "501 Syntax error in parameters or arguments" CRLF #define SMTP_ERROR_SEQUENCE "503 Bad sequence of commands" CRLF #define SMTP_ERROR_RECIPIENTS "554 No valid recipients" CRLF #define SMTP_ERROR_UNIMPLIMENTED "502 Command not implemented" CRLF #define SMTP_ERROR_LIMIT "505 Too many errors. Aborting." CRLF -#define SMTP_ERROR_UPSTREAM \ - "421 Service not available, closing transmission channel" CRLF +#define SMTP_ERROR_UPSTREAM "421 Service not available, closing transmission channel" CRLF #define SMTP_ERROR_FILE "420 Service not available, filesystem error" CRLF #define SMTP_ERROR_OK "250 Requested mail action okay, completed" CRLF #define SMTP_ERROR_DATA_OK "354 Start mail input; end with <CRLF>.<CRLF>" CRLF @@ -45,35 +43,27 @@ struct smtp_command { /* * Generate SMTP error message */ -gchar * make_smtp_error (rspamd_mempool_t *pool, - gint error_code, - const gchar *format, - ...); +gchar * make_smtp_error (rspamd_mempool_t *pool, gint error_code, const gchar *format, ...); /* * Parse a single SMTP command */ -gboolean parse_smtp_command (struct smtp_session *session, - f_str_t *line, - struct smtp_command **cmd); +gboolean parse_smtp_command (struct smtp_session *session, f_str_t *line, struct smtp_command **cmd); /* * Parse HELO command */ -gboolean parse_smtp_helo (struct smtp_session *session, - struct smtp_command *cmd); +gboolean parse_smtp_helo (struct smtp_session *session, struct smtp_command *cmd); /* * Parse MAIL command */ -gboolean parse_smtp_from (struct smtp_session *session, - struct smtp_command *cmd); +gboolean parse_smtp_from (struct smtp_session *session, struct smtp_command *cmd); /* * Parse RCPT command */ -gboolean parse_smtp_rcpt (struct smtp_session *session, - struct smtp_command *cmd); +gboolean parse_smtp_rcpt (struct smtp_session *session, struct smtp_command *cmd); /* Upstream SMTP */ |