dovecot-2.2-pigeonhole: lib-sieve: Cleaned up byte code operand ...
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/63d838bb5184
changeset: 2211:63d838bb5184
user: Stephan Bosch <stephan at rename-it.nl>
date: Fri Jan 08 20:49:39 2016 +0100
description:
lib-sieve: Cleaned up byte code operand and operation definitions using newer C99 syntax.
diffstat:
src/lib-sieve/cmd-discard.c | 9 +-
src/lib-sieve/cmd-keep.c | 9 +-
src/lib-sieve/cmd-redirect.c | 9 +-
src/lib-sieve/cmd-stop.c | 8 +-
src/lib-sieve/ext-envelope.c | 9 +-
src/lib-sieve/ext-fileinto.c | 9 +-
src/lib-sieve/ext-reject.c | 18 +-
src/lib-sieve/plugins/body/tst-body.c | 9 +-
src/lib-sieve/plugins/comparator-i-ascii-numeric/ext-cmp-i-ascii-numeric.c | 9 +-
src/lib-sieve/plugins/copy/ext-copy.c | 9 +-
src/lib-sieve/plugins/date/tst-date.c | 20 +-
src/lib-sieve/plugins/duplicate/tst-duplicate.c | 8 +-
src/lib-sieve/plugins/editheader/cmd-addheader.c | 10 +-
src/lib-sieve/plugins/editheader/cmd-deleteheader.c | 10 +-
src/lib-sieve/plugins/enotify/cmd-notify.c | 10 +-
src/lib-sieve/plugins/enotify/tst-notify-method-capability.c | 10 +-
src/lib-sieve/plugins/enotify/tst-valid-notify-method.c | 10 +-
src/lib-sieve/plugins/enotify/vmodf-encodeurl.c | 9 +-
src/lib-sieve/plugins/environment/tst-environment.c | 9 +-
src/lib-sieve/plugins/ihave/cmd-error.c | 9 +-
src/lib-sieve/plugins/imap4flags/cmd-flag.c | 30 ++--
src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h | 8 +-
src/lib-sieve/plugins/imap4flags/tag-flags.c | 9 +-
src/lib-sieve/plugins/imap4flags/tst-hasflag.c | 10 +-
src/lib-sieve/plugins/include/cmd-global.c | 10 +-
src/lib-sieve/plugins/include/cmd-include.c | 10 +-
src/lib-sieve/plugins/include/cmd-return.c | 9 +-
src/lib-sieve/plugins/index/tag-index.c | 9 +-
src/lib-sieve/plugins/mailbox/tag-mailbox-create.c | 9 +-
src/lib-sieve/plugins/mailbox/tst-mailboxexists.c | 9 +-
src/lib-sieve/plugins/metadata/tst-metadata.c | 20 +-
src/lib-sieve/plugins/metadata/tst-metadataexists.c | 20 +-
src/lib-sieve/plugins/mime/cmd-break.c | 10 +-
src/lib-sieve/plugins/mime/cmd-foreverypart.c | 20 +-
src/lib-sieve/plugins/mime/tag-mime.c | 9 +-
src/lib-sieve/plugins/notify/cmd-denotify.c | 10 +-
src/lib-sieve/plugins/notify/cmd-notify.c | 10 +-
src/lib-sieve/plugins/regex/ext-regex-common.c | 11 +-
src/lib-sieve/plugins/relational/ext-relational-common.c | 17 +-
src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c | 19 +-
src/lib-sieve/plugins/subaddress/ext-subaddress.c | 8 +-
src/lib-sieve/plugins/vacation/cmd-vacation.c | 9 +-
src/lib-sieve/plugins/variables/cmd-set.c | 10 +-
src/lib-sieve/plugins/variables/ext-variables-modifiers.c | 10 +-
src/lib-sieve/plugins/variables/ext-variables-namespaces.c | 10 +-
src/lib-sieve/plugins/variables/ext-variables-operands.c | 20 +-
src/lib-sieve/plugins/variables/tst-string.c | 10 +-
src/lib-sieve/plugins/vnd.dovecot/debug/cmd-debug-log.c | 9 +-
src/lib-sieve/plugins/vnd.dovecot/environment/ext-vnd-environment-variables.c | 9 +-
src/lib-sieve/sieve-address-parts.c | 8 +-
src/lib-sieve/sieve-code.c | 65 ++++-----
src/lib-sieve/sieve-comparators.c | 9 +-
src/lib-sieve/sieve-match-types.c | 9 +-
src/lib-sieve/tst-address.c | 9 +-
src/lib-sieve/tst-exists.c | 9 +-
src/lib-sieve/tst-header.c | 9 +-
src/lib-sieve/tst-size.c | 18 +-
src/plugins/sieve-extprograms/cmd-execute.c | 8 +-
src/plugins/sieve-extprograms/cmd-filter.c | 8 +-
src/plugins/sieve-extprograms/cmd-pipe.c | 7 +-
src/testsuite/cmd-test-binary.c | 20 +-
src/testsuite/cmd-test-config.c | 30 ++--
src/testsuite/cmd-test-fail.c | 10 +-
src/testsuite/cmd-test-imap-metadata.c | 10 +-
src/testsuite/cmd-test-mailbox.c | 20 +-
src/testsuite/cmd-test-message.c | 30 ++--
src/testsuite/cmd-test-result.c | 18 +-
src/testsuite/cmd-test-set.c | 10 +-
src/testsuite/cmd-test.c | 19 +-
src/testsuite/testsuite-objects.c | 10 +-
src/testsuite/testsuite-substitutions.c | 10 +-
src/testsuite/testsuite-variables.c | 10 +-
src/testsuite/tst-test-error.c | 10 +-
src/testsuite/tst-test-multiscript.c | 10 +-
src/testsuite/tst-test-result-action.c | 10 +-
src/testsuite/tst-test-result-execute.c | 9 +-
src/testsuite/tst-test-script-compile.c | 10 +-
src/testsuite/tst-test-script-run.c | 10 +-
78 files changed, 465 insertions(+), 507 deletions(-)
diffs (truncated from 1900 to 300 lines):
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/cmd-discard.c
--- a/src/lib-sieve/cmd-discard.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/cmd-discard.c Fri Jan 08 20:49:39 2016 +0100
@@ -45,11 +45,10 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def cmd_discard_operation = {
- "DISCARD",
- NULL,
- SIEVE_OPERATION_DISCARD,
- cmd_discard_operation_dump,
- cmd_discard_operation_execute
+ .mnemonic = "DISCARD",
+ .code = SIEVE_OPERATION_DISCARD,
+ .dump = cmd_discard_operation_dump,
+ .execute = cmd_discard_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/cmd-keep.c
--- a/src/lib-sieve/cmd-keep.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/cmd-keep.c Fri Jan 08 20:49:39 2016 +0100
@@ -44,11 +44,10 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def cmd_keep_operation = {
- "KEEP",
- NULL,
- SIEVE_OPERATION_KEEP,
- cmd_keep_operation_dump,
- cmd_keep_operation_execute
+ .mnemonic = "KEEP",
+ .code = SIEVE_OPERATION_KEEP,
+ .dump = cmd_keep_operation_dump,
+ .execute = cmd_keep_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/cmd-redirect.c
--- a/src/lib-sieve/cmd-redirect.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/cmd-redirect.c Fri Jan 08 20:49:39 2016 +0100
@@ -68,11 +68,10 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def cmd_redirect_operation = {
- "REDIRECT",
- NULL,
- SIEVE_OPERATION_REDIRECT,
- cmd_redirect_operation_dump,
- cmd_redirect_operation_execute
+ .mnemonic = "REDIRECT",
+ .code = SIEVE_OPERATION_REDIRECT,
+ .dump = cmd_redirect_operation_dump,
+ .execute = cmd_redirect_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/cmd-stop.c
--- a/src/lib-sieve/cmd-stop.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/cmd-stop.c Fri Jan 08 20:49:39 2016 +0100
@@ -39,11 +39,9 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def cmd_stop_operation = {
- "STOP",
- NULL,
- SIEVE_OPERATION_STOP,
- NULL,
- opc_stop_execute
+ .mnemonic = "STOP",
+ .code = SIEVE_OPERATION_STOP,
+ .execute = opc_stop_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/ext-envelope.c
--- a/src/lib-sieve/ext-envelope.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/ext-envelope.c Fri Jan 08 20:49:39 2016 +0100
@@ -100,11 +100,10 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def envelope_operation = {
- "ENVELOPE",
- &envelope_extension,
- 0,
- ext_envelope_operation_dump,
- ext_envelope_operation_execute
+ .mnemonic = "ENVELOPE",
+ .ext_def = &envelope_extension,
+ .dump = ext_envelope_operation_dump,
+ .execute = ext_envelope_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/ext-fileinto.c
--- a/src/lib-sieve/ext-fileinto.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/ext-fileinto.c Fri Jan 08 20:49:39 2016 +0100
@@ -91,11 +91,10 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def fileinto_operation = {
- "FILEINTO",
- &fileinto_extension,
- 0,
- ext_fileinto_operation_dump,
- ext_fileinto_operation_execute
+ .mnemonic = "FILEINTO",
+ .ext_def = &fileinto_extension,
+ .dump = ext_fileinto_operation_dump,
+ .execute = ext_fileinto_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/ext-reject.c
--- a/src/lib-sieve/ext-reject.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/ext-reject.c Fri Jan 08 20:49:39 2016 +0100
@@ -149,21 +149,19 @@
/* Reject operation */
static const struct sieve_operation_def reject_operation = {
- "REJECT",
- &reject_extension,
- 0,
- ext_reject_operation_dump,
- ext_reject_operation_execute
+ .mnemonic = "REJECT",
+ .ext_def = &reject_extension,
+ .dump = ext_reject_operation_dump,
+ .execute = ext_reject_operation_execute
};
/* EReject operation */
static const struct sieve_operation_def ereject_operation = {
- "EREJECT",
- &ereject_extension,
- 0,
- ext_reject_operation_dump,
- ext_reject_operation_execute
+ .mnemonic = "EREJECT",
+ .ext_def = &ereject_extension,
+ .dump = ext_reject_operation_dump,
+ .execute = ext_reject_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/plugins/body/tst-body.c
--- a/src/lib-sieve/plugins/body/tst-body.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/body/tst-body.c Fri Jan 08 20:49:39 2016 +0100
@@ -56,11 +56,10 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def body_operation = {
- "body",
- &body_extension,
- 0,
- ext_body_operation_dump,
- ext_body_operation_execute
+ .mnemonic = "body",
+ .ext_def = &body_extension,
+ .dump = ext_body_operation_dump,
+ .execute = ext_body_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 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
@@ -58,11 +58,10 @@
SIEVE_EXT_DEFINE_COMPARATOR(i_ascii_numeric_comparator);
static const struct sieve_operand_def my_comparator_operand = {
- "comparator-i;ascii-numeric",
- &comparator_i_ascii_numeric_extension,
- 0,
- &sieve_comparator_operand_class,
- &ext_comparators
+ .name = "comparator-i;ascii-numeric",
+ .ext_def = &comparator_i_ascii_numeric_extension,
+ .class = &sieve_comparator_operand_class,
+ .interface = &ext_comparators
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 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
@@ -105,11 +105,10 @@
SIEVE_EXT_DEFINE_SIDE_EFFECT(copy_side_effect);
static const struct sieve_operand_def copy_side_effect_operand = {
- "copy operand",
- ©_extension,
- 0,
- &sieve_side_effect_operand_class,
- &ext_side_effects
+ .name = "copy operand",
+ .ext_def = ©_extension,
+ .class = &sieve_side_effect_operand_class,
+ .interface = &ext_side_effects
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/plugins/date/tst-date.c
--- a/src/lib-sieve/plugins/date/tst-date.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/date/tst-date.c Fri Jan 08 20:49:39 2016 +0100
@@ -115,19 +115,19 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def date_operation = {
- "DATE",
- &date_extension,
- EXT_DATE_OPERATION_DATE,
- tst_date_operation_dump,
- tst_date_operation_execute
+ .mnemonic = "DATE",
+ .ext_def = &date_extension,
+ .code = EXT_DATE_OPERATION_DATE,
+ .dump = tst_date_operation_dump,
+ .execute = tst_date_operation_execute
};
const struct sieve_operation_def currentdate_operation = {
- "CURRENTDATE",
- &date_extension,
- EXT_DATE_OPERATION_CURRENTDATE,
- tst_date_operation_dump,
- tst_date_operation_execute
+ .mnemonic = "CURRENTDATE",
+ .ext_def = &date_extension,
+ .code = EXT_DATE_OPERATION_CURRENTDATE,
+ .dump = tst_date_operation_dump,
+ .execute = tst_date_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/plugins/duplicate/tst-duplicate.c
--- a/src/lib-sieve/plugins/duplicate/tst-duplicate.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/duplicate/tst-duplicate.c Fri Jan 08 20:49:39 2016 +0100
@@ -102,10 +102,10 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def tst_duplicate_operation = {
- "DUPLICATE", &duplicate_extension,
- 0,
- tst_duplicate_operation_dump,
- tst_duplicate_operation_execute
+ .mnemonic = "DUPLICATE",
+ .ext_def = &duplicate_extension,
+ .dump = tst_duplicate_operation_dump,
+ .execute = tst_duplicate_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/plugins/editheader/cmd-addheader.c
--- a/src/lib-sieve/plugins/editheader/cmd-addheader.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/editheader/cmd-addheader.c Fri Jan 08 20:49:39 2016 +0100
@@ -75,11 +75,11 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def addheader_operation = {
- "ADDHEADER",
- &editheader_extension,
- EXT_EDITHEADER_OPERATION_ADDHEADER,
- cmd_addheader_operation_dump,
- cmd_addheader_operation_execute
+ .mnemonic = "ADDHEADER",
+ .ext_def = &editheader_extension,
+ .code = EXT_EDITHEADER_OPERATION_ADDHEADER,
+ .dump = cmd_addheader_operation_dump,
+ .execute = cmd_addheader_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/plugins/editheader/cmd-deleteheader.c
--- a/src/lib-sieve/plugins/editheader/cmd-deleteheader.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/editheader/cmd-deleteheader.c Fri Jan 08 20:49:39 2016 +0100
@@ -94,11 +94,11 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
const struct sieve_operation_def deleteheader_operation = {
- "DELETEHEADER",
- &editheader_extension,
- EXT_EDITHEADER_OPERATION_DELETEHEADER,
- cmd_deleteheader_operation_dump,
- cmd_deleteheader_operation_execute
+ .mnemonic = "DELETEHEADER",
+ .ext_def = &editheader_extension,
+ .code = EXT_EDITHEADER_OPERATION_DELETEHEADER,
+ .dump = cmd_deleteheader_operation_dump,
+ .execute = cmd_deleteheader_operation_execute
};
/*
diff -r 08a93ad9f84f -r 63d838bb5184 src/lib-sieve/plugins/enotify/cmd-notify.c
--- a/src/lib-sieve/plugins/enotify/cmd-notify.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/plugins/enotify/cmd-notify.c Fri Jan 08 20:49:39 2016 +0100
@@ -109,11 +109,11 @@
(const struct sieve_runtime_env *renv, sieve_size_t *address);
More information about the dovecot-cvs
mailing list