diff --git a/src/lib-sieve/util/test-edit-mail.c b/src/lib-sieve/util/test-edit-mail.c
index 902d3aea303ac0e0be051adbb947f54b4555225c..244e6b2bd18a5ee55695f776175ae58b5463cfe4 100644
--- a/src/lib-sieve/util/test-edit-mail.c
+++ b/src/lib-sieve/util/test-edit-mail.c
@@ -63,10 +63,11 @@ static int test_init_mail_user(void)
.debug = TRUE,
};
- mail_storage_service = mail_storage_service_init(master_service, NULL,
- MAIL_STORAGE_SERVICE_FLAG_NO_RESTRICT_ACCESS |
- MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT |
- MAIL_STORAGE_SERVICE_FLAG_NO_PLUGINS);
+ mail_storage_service = mail_storage_service_init(
+ master_service, NULL,
+ (MAIL_STORAGE_SERVICE_FLAG_NO_RESTRICT_ACCESS |
+ MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT |
+ MAIL_STORAGE_SERVICE_FLAG_NO_PLUGINS));
if (mail_storage_service_lookup(mail_storage_service, &input,
&test_service_user, &error) < 0)
@@ -186,7 +187,7 @@ static void test_edit_mail_concatenated(void)
test_begin("edit-mail - concatenated");
test_init();
- /* compose the message */
+ /* Compose the message */
inputs[0] = i_stream_create_from_data(msg_part1, strlen(msg_part1));
inputs[1] = i_stream_create_from_data(msg_part2, strlen(msg_part2));
@@ -203,7 +204,7 @@ static void test_edit_mail_concatenated(void)
rawmail = mail_raw_open_stream(test_raw_mail_user, input_msg);
- /* add headers */
+ /* Add headers */
edmail = edit_mail_wrap(rawmail->mail);
@@ -212,22 +213,22 @@ static void test_edit_mail_concatenated(void)
mail = edit_mail_get_mail(edmail);
- /* evaluate modified header */
+ /* Evaluate modified header */
test_assert(mail_get_first_header_utf8(mail, "Subject", &value) > 0);
test_assert(strcmp(value, "Sieve editheader breaks with LMTP") == 0);
test_assert(mail_get_first_header_utf8(mail, "X-Filter-Junk-Flag",
- &value) > 0);
+ &value) > 0);
test_assert(strcmp(value, "NO") == 0);
test_assert(mail_get_first_header_utf8(mail, "X-Filter-Junk-Type",
- &value) > 0);
+ &value) > 0);
test_assert(strcmp(value, "NONE") == 0);
test_assert(mail_get_first_header_utf8(mail, "Delivered-To",
- &value) > 0);
+ &value) > 0);
- /* prepare tests */
+ /* Prepare tests */
if (mail_get_stream(mail, NULL, NULL, &input_mail) < 0) {
i_fatal("Failed to open mail stream: %s",
@@ -237,7 +238,7 @@ static void test_edit_mail_concatenated(void)
buffer = buffer_create_dynamic(default_pool, 1024);
expected = t_str_new(1024);
- /* added */
+ /* Added */
i_stream_seek(input_mail, 0);
buffer_set_used_size(buffer, 0);
@@ -252,10 +253,9 @@ static void test_edit_mail_concatenated(void)
str_append(expected, msg_part3);
str_append(expected, msg_part4);
- test_out("added",
- strcmp(str_c(buffer), str_c(expected)) == 0);
+ test_out("added", strcmp(str_c(buffer), str_c(expected)) == 0);
- /* added, slow */
+ /* Added, slow */
i_stream_seek(input_mail, 0);
buffer_set_used_size(buffer, 0);
@@ -269,18 +269,17 @@ static void test_edit_mail_concatenated(void)
str_append(expected, msg_part3);
str_append(expected, msg_part4);
- test_out("added, slow",
- strcmp(str_c(buffer), str_c(expected)) == 0);
+ test_out("added, slow", strcmp(str_c(buffer), str_c(expected)) == 0);
- /* added, filtered */
+ /* Added, filtered */
i_stream_seek(input_mail, 0);
buffer_set_used_size(buffer, 0);
- input_filt = i_stream_create_header_filter(input_mail,
- HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR, hide_headers,
- N_ELEMENTS(hide_headers), *null_header_filter_callback,
- (void *)NULL);
+ input_filt = i_stream_create_header_filter(
+ input_mail, (HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR),
+ hide_headers, N_ELEMENTS(hide_headers),
+ *null_header_filter_callback, (void *)NULL);
input = i_stream_create_lf(input_filt);
i_stream_unref(&input_filt);
@@ -299,15 +298,15 @@ static void test_edit_mail_concatenated(void)
i_stream_unref(&input);
- /* added, filtered, slow */
+ /* Added, filtered, slow */
i_stream_seek(input_mail, 0);
buffer_set_used_size(buffer, 0);
- input_filt = i_stream_create_header_filter(input_mail,
- HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR, hide_headers,
- N_ELEMENTS(hide_headers), *null_header_filter_callback,
- (void *)NULL);
+ input_filt = i_stream_create_header_filter(
+ input_mail, (HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR),
+ hide_headers, N_ELEMENTS(hide_headers),
+ *null_header_filter_callback, (void *)NULL);
input = i_stream_create_lf(input_filt);
i_stream_unref(&input_filt);
@@ -326,26 +325,26 @@ static void test_edit_mail_concatenated(void)
i_stream_unref(&input);
- /* delete header */
+ /* Delete header */
edit_mail_header_delete(edmail, "Delivered-To", 0);
- /* evaluate modified header */
+ /* Evaluate modified header */
test_assert(mail_get_first_header_utf8(mail, "Subject", &value) > 0);
test_assert(strcmp(value, "Sieve editheader breaks with LMTP") == 0);
test_assert(mail_get_first_header_utf8(mail, "X-Filter-Junk-Flag",
- &value) > 0);
+ &value) > 0);
test_assert(strcmp(value, "NO") == 0);
test_assert(mail_get_first_header_utf8(mail, "X-Filter-Junk-Type",
- &value) > 0);
+ &value) > 0);
test_assert(strcmp(value, "NONE") == 0);
test_assert(mail_get_first_header_utf8(mail, "Delivered-To",
- &value) == 0);
+ &value) == 0);
- /* deleted */
+ /* Deleted */
i_stream_seek(input_mail, 0);
buffer_set_used_size(buffer, 0);
@@ -359,10 +358,9 @@ static void test_edit_mail_concatenated(void)
str_append(expected, msg_part2);
str_append(expected, msg_part4);
- test_out("deleted",
- strcmp(str_c(buffer), str_c(expected)) == 0);
+ test_out("deleted", strcmp(str_c(buffer), str_c(expected)) == 0);
- /* deleted, slow */
+ /* Deleted, slow */
i_stream_seek(input_mail, 0);
buffer_set_used_size(buffer, 0);
@@ -375,18 +373,17 @@ static void test_edit_mail_concatenated(void)
str_append(expected, msg_part2);
str_append(expected, msg_part4);
- test_out("deleted, slow",
- strcmp(str_c(buffer), str_c(expected)) == 0);
+ test_out("deleted, slow", strcmp(str_c(buffer), str_c(expected)) == 0);
- /* deleted, filtered */
+ /* Deleted, filtered */
i_stream_seek(input_mail, 0);
buffer_set_used_size(buffer, 0);
- input_filt = i_stream_create_header_filter(input_mail,
- HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR, hide_headers,
- N_ELEMENTS(hide_headers), *null_header_filter_callback,
- (void *)NULL);
+ input_filt = i_stream_create_header_filter(
+ input_mail, (HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR),
+ hide_headers, N_ELEMENTS(hide_headers),
+ *null_header_filter_callback, (void *)NULL);
input = i_stream_create_lf(input_filt);
i_stream_unref(&input_filt);
@@ -404,7 +401,7 @@ static void test_edit_mail_concatenated(void)
i_stream_unref(&input);
- /* deleted, filtered, slow */
+ /* Deleted, filtered, slow */
i_stream_seek(input_mail, 0);
buffer_set_used_size(buffer, 0);
@@ -724,8 +721,7 @@ static void test_edit_mail_big_header(void)
/* evaluate modified header */
- test_assert(mail_get_first_header_utf8(mail, "X-B",
- &value) == 0);
+ test_assert(mail_get_first_header_utf8(mail, "X-B", &value) == 0);
/* deleted */