dovecot-2.2-pigeonhole: lib-sieve: Cleaned up object definitions...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Fri Jan 8 19:51:28 UTC 2016
details: http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/9748a6055d2c
changeset: 2212:9748a6055d2c
user: Stephan Bosch <stephan at rename-it.nl>
date: Fri Jan 08 20:49:39 2016 +0100
description:
lib-sieve: Cleaned up object definitions using newer C99 syntax.
diffstat:
src/lib-sieve/cmp-i-ascii-casemap.c | 17 +++++----
src/lib-sieve/cmp-i-octet.c | 16 +++++---
src/lib-sieve/mcht-contains.c | 10 ++---
src/lib-sieve/mcht-is.c | 7 +--
src/lib-sieve/mcht-matches.c | 10 ++---
src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c | 11 +++--
src/lib-sieve/plugins/copy/ext-copy.c | 9 +---
src/lib-sieve/plugins/include/ext-include-variables.c | 9 ++--
src/lib-sieve/plugins/mailbox/tag-mailbox-create.c | 8 +--
src/lib-sieve/plugins/regex/mcht-regex.c | 11 ++----
src/lib-sieve/plugins/relational/mcht-count.c | 14 +++----
src/lib-sieve/plugins/relational/mcht-value.c | 14 +++----
src/lib-sieve/plugins/subaddress/ext-subaddress.c | 8 ++-
src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-variables.c | 8 ++--
src/lib-sieve/sieve-address-parts.c | 15 +++++---
src/lib-sieve/sieve-objects.h | 8 +++-
src/testsuite/testsuite-objects.c | 17 ++++-----
src/testsuite/testsuite-substitutions.c | 13 +++----
18 files changed, 101 insertions(+), 104 deletions(-)
diffs (truncated from 414 to 300 lines):
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/cmp-i-ascii-casemap.c
--- a/src/lib-sieve/cmp-i-ascii-casemap.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/cmp-i-ascii-casemap.c Fri Jan 08 20:49:39 2016 +0100
@@ -30,13 +30,16 @@
*/
const struct sieve_comparator_def i_ascii_casemap_comparator = {
- SIEVE_OBJECT
- ("i;ascii-casemap", &comparator_operand, SIEVE_COMPARATOR_I_ASCII_CASEMAP),
- SIEVE_COMPARATOR_FLAG_ORDERING | SIEVE_COMPARATOR_FLAG_EQUALITY |
- SIEVE_COMPARATOR_FLAG_SUBSTRING_MATCH | SIEVE_COMPARATOR_FLAG_PREFIX_MATCH,
- cmp_i_ascii_casemap_compare,
- cmp_i_ascii_casemap_char_match,
- sieve_comparator_octet_skip
+ SIEVE_OBJECT("i;ascii-casemap",
+ &comparator_operand, SIEVE_COMPARATOR_I_ASCII_CASEMAP),
+ .flags =
+ SIEVE_COMPARATOR_FLAG_ORDERING |
+ SIEVE_COMPARATOR_FLAG_EQUALITY |
+ SIEVE_COMPARATOR_FLAG_SUBSTRING_MATCH |
+ SIEVE_COMPARATOR_FLAG_PREFIX_MATCH,
+ .compare = cmp_i_ascii_casemap_compare,
+ .char_match = cmp_i_ascii_casemap_char_match,
+ .char_skip = sieve_comparator_octet_skip
};
/*
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/cmp-i-octet.c
--- a/src/lib-sieve/cmp-i-octet.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/cmp-i-octet.c Fri Jan 08 20:49:39 2016 +0100
@@ -29,12 +29,16 @@
*/
const struct sieve_comparator_def i_octet_comparator = {
- SIEVE_OBJECT("i;octet", &comparator_operand, SIEVE_COMPARATOR_I_OCTET),
- SIEVE_COMPARATOR_FLAG_ORDERING | SIEVE_COMPARATOR_FLAG_EQUALITY |
- SIEVE_COMPARATOR_FLAG_SUBSTRING_MATCH | SIEVE_COMPARATOR_FLAG_PREFIX_MATCH,
- cmp_i_octet_compare,
- cmp_i_octet_char_match,
- sieve_comparator_octet_skip
+ SIEVE_OBJECT("i;octet",
+ &comparator_operand, SIEVE_COMPARATOR_I_OCTET),
+ .flags =
+ SIEVE_COMPARATOR_FLAG_ORDERING |
+ SIEVE_COMPARATOR_FLAG_EQUALITY |
+ SIEVE_COMPARATOR_FLAG_SUBSTRING_MATCH |
+ SIEVE_COMPARATOR_FLAG_PREFIX_MATCH,
+ .compare = cmp_i_octet_compare,
+ .char_match = cmp_i_octet_char_match,
+ .char_skip = sieve_comparator_octet_skip
};
/*
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/mcht-contains.c
--- a/src/lib-sieve/mcht-contains.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/mcht-contains.c Fri Jan 08 20:49:39 2016 +0100
@@ -26,12 +26,10 @@
*/
const struct sieve_match_type_def contains_match_type = {
- SIEVE_OBJECT("contains", &match_type_operand, SIEVE_MATCH_TYPE_CONTAINS),
- NULL,
- sieve_match_substring_validate_context,
- NULL, NULL, NULL,
- mcht_contains_match_key,
- NULL
+ SIEVE_OBJECT("contains",
+ &match_type_operand, SIEVE_MATCH_TYPE_CONTAINS),
+ .validate_context = sieve_match_substring_validate_context,
+ .match_key = mcht_contains_match_key
};
/*
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/mcht-is.c
--- a/src/lib-sieve/mcht-is.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/mcht-is.c Fri Jan 08 20:49:39 2016 +0100
@@ -26,10 +26,9 @@
*/
const struct sieve_match_type_def is_match_type = {
- SIEVE_OBJECT("is", &match_type_operand, SIEVE_MATCH_TYPE_IS),
- NULL, NULL, NULL, NULL, NULL,
- mcht_is_match_key,
- NULL
+ SIEVE_OBJECT("is",
+ &match_type_operand, SIEVE_MATCH_TYPE_IS),
+ .match_key = mcht_is_match_key
};
/*
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/mcht-matches.c
--- a/src/lib-sieve/mcht-matches.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/mcht-matches.c Fri Jan 08 20:49:39 2016 +0100
@@ -27,12 +27,10 @@
*/
const struct sieve_match_type_def matches_match_type = {
- SIEVE_OBJECT("matches", &match_type_operand, SIEVE_MATCH_TYPE_MATCHES),
- NULL,
- sieve_match_substring_validate_context,
- NULL, NULL, NULL,
- mcht_matches_match_key,
- NULL
+ SIEVE_OBJECT("matches",
+ &match_type_operand, SIEVE_MATCH_TYPE_MATCHES),
+ .validate_context = sieve_match_substring_validate_context,
+ .match_key = mcht_matches_match_key
};
/*
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c
--- a/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c Fri Jan 08 20:49:39 2016 +0100
@@ -77,11 +77,12 @@
/* Comparator object */
const struct sieve_comparator_def i_ascii_numeric_comparator = {
- SIEVE_OBJECT("i;ascii-numeric", &my_comparator_operand, 0),
- SIEVE_COMPARATOR_FLAG_ORDERING | SIEVE_COMPARATOR_FLAG_EQUALITY,
- cmp_i_ascii_numeric_compare,
- NULL,
- NULL
+ SIEVE_OBJECT("i;ascii-numeric",
+ &my_comparator_operand, 0),
+ .flags =
+ SIEVE_COMPARATOR_FLAG_ORDERING |
+ SIEVE_COMPARATOR_FLAG_EQUALITY,
+ .compare = cmp_i_ascii_numeric_compare
};
/* Comparator implementation */
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/plugins/copy/ext-copy.c
--- a/src/lib-sieve/plugins/copy/ext-copy.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/copy/ext-copy.c Fri Jan 08 20:49:39 2016 +0100
@@ -72,12 +72,9 @@
const struct sieve_side_effect_def copy_side_effect = {
SIEVE_OBJECT("copy", ©_side_effect_operand, 0),
- &act_store,
- NULL, NULL, NULL,
- seff_copy_print,
- NULL, NULL,
- seff_copy_post_commit,
- NULL
+ .to_action = &act_store,
+ .print = seff_copy_print,
+ .post_commit = seff_copy_post_commit
};
/*
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/plugins/include/ext-include-variables.c
--- a/src/lib-sieve/plugins/include/ext-include-variables.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/include/ext-include-variables.c Fri Jan 08 20:49:39 2016 +0100
@@ -160,14 +160,13 @@
const struct sieve_variables_namespace *nspc,
struct sieve_ast_argument *arg, struct sieve_command *cmd, void *var_data);
-static const struct sieve_variables_namespace_def global_variables_namespace = {
+static const struct sieve_variables_namespace_def
+global_variables_namespace = {
SIEVE_OBJECT("global", NULL, 0),
- vnspc_global_variables_validate,
- vnspc_global_variables_generate,
- NULL, NULL
+ .validate = vnspc_global_variables_validate,
+ .generate = vnspc_global_variables_generate
};
-
bool vnspc_global_variables_validate
(struct sieve_validator *valdtr,
const struct sieve_variables_namespace *nspc, struct sieve_ast_argument *arg,
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/plugins/mailbox/tag-mailbox-create.c
--- a/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c Fri Jan 08 20:49:39 2016 +0100
@@ -46,11 +46,9 @@
const struct sieve_side_effect_def mailbox_create_side_effect = {
SIEVE_OBJECT("create", &mailbox_create_operand, 0),
- &act_store,
- NULL, NULL, NULL,
- seff_mailbox_create_print,
- seff_mailbox_create_pre_execute,
- NULL, NULL, NULL
+ .to_action = &act_store,
+ .print = seff_mailbox_create_print,
+ .pre_execute = seff_mailbox_create_pre_execute
};
/*
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/plugins/regex/mcht-regex.c
--- a/src/lib-sieve/plugins/regex/mcht-regex.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/regex/mcht-regex.c Fri Jan 08 20:49:39 2016 +0100
@@ -50,13 +50,10 @@
const struct sieve_match_type_def regex_match_type = {
SIEVE_OBJECT("regex", ®ex_match_type_operand, 0),
- NULL,
- mcht_regex_validate_context,
- NULL,
- mcht_regex_match_init,
- mcht_regex_match_keys,
- NULL,
- mcht_regex_match_deinit
+ .validate_context = mcht_regex_validate_context,
+ .match_init = mcht_regex_match_init,
+ .match_keys = mcht_regex_match_keys,
+ .match_deinit = mcht_regex_match_deinit
};
/*
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/plugins/relational/mcht-count.c
--- a/src/lib-sieve/plugins/relational/mcht-count.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/relational/mcht-count.c Fri Jan 08 20:49:39 2016 +0100
@@ -37,19 +37,17 @@
*/
const struct sieve_match_type_def count_match_type = {
- SIEVE_OBJECT("count", &rel_match_type_operand, RELATIONAL_COUNT),
- mcht_relational_validate,
- NULL, NULL, NULL, NULL, NULL, NULL
+ SIEVE_OBJECT("count",
+ &rel_match_type_operand, RELATIONAL_COUNT),
+ .validate = mcht_relational_validate
};
#define COUNT_MATCH_TYPE(name, rel_match) \
const struct sieve_match_type_def rel_match_count_ ## name = { \
- SIEVE_OBJECT( \
- "count-" #name, &rel_match_type_operand, \
+ SIEVE_OBJECT("count-" #name, \
+ &rel_match_type_operand, \
REL_MATCH_INDEX(RELATIONAL_COUNT, rel_match)), \
- NULL, NULL, \
- mcht_count_match, \
- NULL, NULL, NULL, NULL \
+ .match = mcht_count_match, \
}
COUNT_MATCH_TYPE(gt, REL_MATCH_GREATER);
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/plugins/relational/mcht-value.c
--- a/src/lib-sieve/plugins/relational/mcht-value.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/relational/mcht-value.c Fri Jan 08 20:49:39 2016 +0100
@@ -24,19 +24,17 @@
*/
const struct sieve_match_type_def value_match_type = {
- SIEVE_OBJECT("value", &rel_match_type_operand, RELATIONAL_VALUE),
- mcht_relational_validate,
- NULL, NULL, NULL, NULL, NULL, NULL
+ SIEVE_OBJECT("value",
+ &rel_match_type_operand, RELATIONAL_VALUE),
+ .validate = mcht_relational_validate
};
#define VALUE_MATCH_TYPE(name, rel_match) \
const struct sieve_match_type_def rel_match_value_ ## name = { \
- SIEVE_OBJECT( \
- "value-" #name, &rel_match_type_operand, \
+ SIEVE_OBJECT("value-" #name, \
+ &rel_match_type_operand, \
REL_MATCH_INDEX(RELATIONAL_VALUE, rel_match)), \
- NULL, NULL, NULL, NULL, NULL, \
- mcht_value_match_key, \
- NULL \
+ .match_key = mcht_value_match_key, \
}
VALUE_MATCH_TYPE(gt, REL_MATCH_GREATER);
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/plugins/subaddress/ext-subaddress.c
--- a/src/lib-sieve/plugins/subaddress/ext-subaddress.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/subaddress/ext-subaddress.c Fri Jan 08 20:49:39 2016 +0100
@@ -124,13 +124,15 @@
/* Address part objects */
const struct sieve_address_part_def user_address_part = {
- SIEVE_OBJECT("user", &subaddress_operand, SUBADDRESS_USER),
+ SIEVE_OBJECT("user",
+ &subaddress_operand, SUBADDRESS_USER),
subaddress_user_extract_from
};
const struct sieve_address_part_def detail_address_part = {
- SIEVE_OBJECT("detail", &subaddress_operand, SUBADDRESS_DETAIL),
- subaddress_detail_extract_from
+ SIEVE_OBJECT("detail",
+ &subaddress_operand, SUBADDRESS_DETAIL),
+ .extract_from = subaddress_detail_extract_from
};
/* Address part implementation */
diff -r 63d838bb5184 -r 9748a6055d2c src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-variables.c
--- a/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-variables.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-variables.c Fri Jan 08 20:49:39 2016 +0100
@@ -42,10 +42,10 @@
static const struct sieve_variables_namespace_def
environment_namespace = {
SIEVE_OBJECT("env", &environment_namespace_operand, 0),
- vnspc_vnd_environment_validate,
- vnspc_vnd_environment_generate,
More information about the dovecot-cvs
mailing list