lib-smtp: Reformat smtp-syntax.c.

diff --git a/src/lib-smtp/smtp-syntax.c b/src/lib-smtp/smtp-syntax.c
index fdf5bdee2099e834480b13276353fd361b1d1627..ce53f30deecebff3fc9418e7b3bf9ee7a049c4b6 100644 (file)
--- a/src/lib-smtp/smtp-syntax.c
+++ b/src/lib-smtp/smtp-syntax.c
@@ -13,8 +13,8 @@
  * String
  */
 
-int smtp_string_parse(const char *string,
-       const char **value_r, const char **error_r)
+int smtp_string_parse(const char *string, const char **value_r,
+                     const char **error_r)
 {
        struct smtp_parser parser;
 
@@ -79,8 +79,8 @@ void smtp_string_write(string_t *out, const char *value)
  * Xtext encoding
  */
 
-int smtp_xtext_parse(const char *xtext,
-       const char **value_r, const char **error_r)
+int smtp_xtext_parse(const char *xtext, const char **value_r,
+                    const char **error_r)
 {
        struct smtp_parser parser;
        string_t *value = NULL;
@@ -115,8 +115,7 @@ int smtp_xtext_parse(const char *xtext,
        return 1;
 }
 
-void smtp_xtext_encode(string_t *out, const unsigned char *data,
-       size_t size)
+void smtp_xtext_encode(string_t *out, const unsigned char *data, size_t size)
 {
        const unsigned char *p, *pbegin, *pend;
 
@@ -140,22 +139,24 @@ void smtp_xtext_encode(string_t *out, const unsigned char *data,
  * HELO domain
  */
 
-int smtp_helo_domain_parse(const char *helo,
-       bool allow_literal, const char **domain_r)
+int smtp_helo_domain_parse(const char *helo, bool allow_literal,
+                          const char **domain_r)
 {
        struct smtp_parser parser;
        int ret;
 
        smtp_parser_init(&parser, pool_datastack_create(), helo);
 
-       if ((ret=smtp_parser_parse_domain(&parser, domain_r)) == 0) {
-               if (allow_literal)
-                       ret = smtp_parser_parse_address_literal(&parser, domain_r, NULL);
+       ret = smtp_parser_parse_domain(&parser, domain_r);
+       if (ret == 0) {
+               if (allow_literal) {
+                       ret = smtp_parser_parse_address_literal(
+                               &parser, domain_r, NULL);
+               }
        }
 
        if (ret <= 0 || (parser.cur < parser.end && *parser.cur != ' '))
                return -1;
-
        return 0;
 }
 
@@ -219,15 +220,15 @@ bool smtp_ehlo_params_str_is_valid(const char *params)
        return TRUE;
 }
 
-static int smtp_parse_ehlo_line(struct smtp_parser *parser,
-       const char **key_r, const char *const **params_r)
+static int
+smtp_parse_ehlo_line(struct smtp_parser *parser, const char **key_r,
+                    const char *const **params_r)
 {
        const unsigned char *pbegin = parser->cur;
        ARRAY_TYPE(const_string) params = ARRAY_INIT;
        const char *param;
 
-       /*
-          ehlo-line      = ehlo-keyword *( SP ehlo-param )
+       /* ehlo-line      = ehlo-keyword *( SP ehlo-param )
           ehlo-keyword   = (ALPHA / DIGIT) *(ALPHA / DIGIT / "-")
                            ; additional syntax of ehlo-params depends on
                            ; ehlo-keyword
@@ -244,7 +245,7 @@ static int smtp_parse_ehlo_line(struct smtp_parser *parser,
        parser->cur++;
 
        while (parser->cur < parser->end &&
-               (i_isalnum(*parser->cur) || *parser->cur == '-'))
+              (i_isalnum(*parser->cur) || *parser->cur == '-'))
                parser->cur++;
 
        if (key_r != NULL)
@@ -266,17 +267,21 @@ static int smtp_parse_ehlo_line(struct smtp_parser *parser,
                p_array_init(&params, parser->pool, 32);
        while (parser->cur < parser->end) {
                if (*parser->cur == ' ') {
-                       if (parser->cur+1 >= parser->end || *(parser->cur+1) == ' ') {
-                               parser->error = "Missing EHLO parameter after ' '";
+                       if (parser->cur+1 >= parser->end ||
+                           *(parser->cur+1) == ' ') {
+                               parser->error =
+                                       "Missing EHLO parameter after ' '";
                                return -1;
                        }
                        if (params_r != NULL) {
-                               param = p_strdup_until(parser->pool, pbegin, parser->cur);
+                               param = p_strdup_until(parser->pool, pbegin,
+                                                      parser->cur);
                                array_push_back(&params, &param);
                        }
                        pbegin = parser->cur + 1;
                } else if (!smtp_char_is_ehlo_param(*parser->cur)) {
-                       parser->error = "Unexpected character in EHLO parameter";
+                       parser->error =
+                               "Unexpected character in EHLO parameter";
                        return -1;
                }
                parser->cur++;
@@ -292,7 +297,7 @@ static int smtp_parse_ehlo_line(struct smtp_parser *parser,
 }
 
 int smtp_ehlo_line_parse(const char *ehlo_line, const char **key_r,
-       const char *const **params_r, const char **error_r)
+                        const char *const **params_r, const char **error_r)
 {
        struct smtp_parser parser;