dovecot-2.2-pigeonhole: lib-sieve: Cleaned up command definition...
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/08a93ad9f84f
changeset: 2210:08a93ad9f84f
user: Stephan Bosch <stephan at rename-it.nl>
date: Fri Jan 08 20:49:39 2016 +0100
description:
lib-sieve: Cleaned up command definitions using newer C99 syntax.
diffstat:
src/lib-sieve/cmd-discard.c | 13 +-
src/lib-sieve/cmd-if.c | 52 ++++++-----
src/lib-sieve/cmd-keep.c | 13 +-
src/lib-sieve/cmd-redirect.c | 16 +-
src/lib-sieve/cmd-require.c | 13 +-
src/lib-sieve/cmd-stop.c | 16 +-
src/lib-sieve/ext-envelope.c | 18 ++--
src/lib-sieve/ext-fileinto.c | 16 +-
src/lib-sieve/ext-reject.c | 32 +++---
src/lib-sieve/plugins/body/tst-body.c | 18 ++--
src/lib-sieve/plugins/date/tst-date.c | 36 ++++----
src/lib-sieve/plugins/duplicate/tst-duplicate.c | 15 +-
src/lib-sieve/plugins/editheader/cmd-addheader.c | 18 ++--
src/lib-sieve/plugins/editheader/cmd-deleteheader.c | 19 ++--
src/lib-sieve/plugins/enotify/cmd-notify.c | 19 ++--
src/lib-sieve/plugins/enotify/tst-notify-method-capability.c | 18 ++--
src/lib-sieve/plugins/enotify/tst-valid-notify-method.c | 16 +-
src/lib-sieve/plugins/environment/tst-environment.c | 18 ++--
src/lib-sieve/plugins/ihave/cmd-error.c | 16 +-
src/lib-sieve/plugins/ihave/tst-ihave.c | 15 +-
src/lib-sieve/plugins/imap4flags/cmd-flag.c | 51 +++++------
src/lib-sieve/plugins/imap4flags/ext-imapflags.c | 26 +++--
src/lib-sieve/plugins/imap4flags/tst-hasflag.c | 19 ++--
src/lib-sieve/plugins/include/cmd-global.c | 48 +++++-----
src/lib-sieve/plugins/include/cmd-include.c | 19 ++--
src/lib-sieve/plugins/include/cmd-return.c | 13 +-
src/lib-sieve/plugins/mailbox/tst-mailboxexists.c | 16 +-
src/lib-sieve/plugins/metadata/tst-metadata.c | 36 ++++----
src/lib-sieve/plugins/metadata/tst-metadataexists.c | 33 +++---
src/lib-sieve/plugins/mime/cmd-break.c | 19 ++--
src/lib-sieve/plugins/mime/cmd-foreverypart.c | 19 ++--
src/lib-sieve/plugins/notify/cmd-denotify.c | 19 ++--
src/lib-sieve/plugins/notify/cmd-notify.c | 19 ++--
src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c | 36 ++++----
src/lib-sieve/plugins/vacation/cmd-vacation.c | 19 ++--
src/lib-sieve/plugins/variables/cmd-set.c | 19 ++--
src/lib-sieve/plugins/variables/tst-string.c | 18 ++--
src/lib-sieve/plugins/vnd.dovecot/debug/cmd-debug-log.c | 16 +-
src/lib-sieve/sieve-commands.h | 2 +-
src/lib-sieve/sieve-validator.c | 11 +-
src/lib-sieve/tst-address.c | 18 ++--
src/lib-sieve/tst-allof.c | 15 +-
src/lib-sieve/tst-anyof.c | 15 +-
src/lib-sieve/tst-exists.c | 17 +--
src/lib-sieve/tst-header.c | 18 ++--
src/lib-sieve/tst-not.c | 15 +-
src/lib-sieve/tst-size.c | 19 ++--
src/lib-sieve/tst-truefalse.c | 30 +++---
src/plugins/sieve-extprograms/cmd-execute.c | 19 ++--
src/plugins/sieve-extprograms/cmd-filter.c | 17 +--
src/plugins/sieve-extprograms/cmd-pipe.c | 19 ++--
src/testsuite/cmd-test-binary.c | 34 +++----
src/testsuite/cmd-test-config.c | 47 +++++-----
src/testsuite/cmd-test-fail.c | 16 +-
src/testsuite/cmd-test-imap-metadata.c | 18 ++--
src/testsuite/cmd-test-mailbox.c | 32 +++---
src/testsuite/cmd-test-message.c | 32 +++---
src/testsuite/cmd-test-result.c | 26 +++--
src/testsuite/cmd-test-set.c | 16 +-
src/testsuite/cmd-test.c | 16 +-
src/testsuite/tst-test-error.c | 18 ++--
src/testsuite/tst-test-multiscript.c | 16 +-
src/testsuite/tst-test-result-action.c | 18 ++--
src/testsuite/tst-test-result-execute.c | 13 +-
src/testsuite/tst-test-script-compile.c | 16 +-
src/testsuite/tst-test-script-run.c | 15 +-
66 files changed, 706 insertions(+), 684 deletions(-)
diffs (truncated from 2195 to 300 lines):
diff -r 65bc76bb3345 -r 08a93ad9f84f 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
@@ -26,12 +26,13 @@
struct sieve_command *ctx ATTR_UNUSED);
const struct sieve_command_def cmd_discard = {
- "discard",
- SCT_COMMAND,
- 0, 0, FALSE, FALSE,
- NULL, NULL, NULL, NULL,
- cmd_discard_generate,
- NULL
+ .identifier = "discard",
+ .type = SCT_COMMAND,
+ .positional_args = 0,
+ .subtests = 0,
+ .block_allowed = FALSE,
+ .block_required = FALSE,
+ .generate = cmd_discard_generate
};
/*
diff -r 65bc76bb3345 -r 08a93ad9f84f src/lib-sieve/cmd-if.c
--- a/src/lib-sieve/cmd-if.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/cmd-if.c Fri Jan 08 20:49:39 2016 +0100
@@ -31,14 +31,15 @@
*/
const struct sieve_command_def cmd_if = {
- "if",
- SCT_COMMAND,
- 0, 1, TRUE, TRUE,
- NULL, NULL,
- cmd_if_validate,
- cmd_if_validate_const,
- cmd_if_generate,
- NULL
+ .identifier = "if",
+ .type = SCT_COMMAND,
+ .positional_args = 0,
+ .subtests = 1,
+ .block_allowed = TRUE,
+ .block_required = TRUE,
+ .validate = cmd_if_validate,
+ .validate_const = cmd_if_validate_const,
+ .generate = cmd_if_generate
};
/* ElsIf command
@@ -48,14 +49,15 @@
*/
const struct sieve_command_def cmd_elsif = {
- "elsif",
- SCT_COMMAND,
- 0, 1, TRUE, TRUE,
- NULL, NULL,
- cmd_elsif_validate,
- cmd_if_validate_const,
- cmd_if_generate,
- NULL
+ .identifier = "elsif",
+ .type = SCT_COMMAND,
+ .positional_args = 0,
+ .subtests = 1,
+ .block_allowed = TRUE,
+ .block_required = TRUE,
+ .validate = cmd_elsif_validate,
+ .validate_const = cmd_if_validate_const,
+ .generate = cmd_if_generate
};
/* Else command
@@ -64,16 +66,16 @@
* else <block>
*/
-
const struct sieve_command_def cmd_else = {
- "else",
- SCT_COMMAND,
- 0, 0, TRUE, TRUE,
- NULL, NULL,
- cmd_elsif_validate,
- cmd_if_validate_const,
- cmd_else_generate,
- NULL
+ .identifier = "else",
+ .type = SCT_COMMAND,
+ .positional_args = 0,
+ .subtests = 0,
+ .block_allowed = TRUE,
+ .block_required = TRUE,
+ .validate = cmd_elsif_validate,
+ .validate_const = cmd_if_validate_const,
+ .generate = cmd_else_generate
};
/*
diff -r 65bc76bb3345 -r 08a93ad9f84f 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
@@ -25,12 +25,13 @@
(const struct sieve_codegen_env *cgenv, struct sieve_command *cmd);
const struct sieve_command_def cmd_keep = {
- "keep",
- SCT_COMMAND,
- 0, 0, FALSE, FALSE,
- NULL, NULL, NULL, NULL,
- cmd_keep_generate,
- NULL
+ .identifier = "keep",
+ .type = SCT_COMMAND,
+ .positional_args = 0,
+ .subtests = 0,
+ .block_allowed = FALSE,
+ .block_required = FALSE,
+ .generate = cmd_keep_generate
};
/*
diff -r 65bc76bb3345 -r 08a93ad9f84f 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
@@ -48,14 +48,14 @@
(const struct sieve_codegen_env *cgenv, struct sieve_command *cmd);
const struct sieve_command_def cmd_redirect = {
- "redirect",
- SCT_COMMAND,
- 1, 0, FALSE, FALSE,
- NULL, NULL,
- cmd_redirect_validate,
- NULL,
- cmd_redirect_generate,
- NULL
+ .identifier = "redirect",
+ .type = SCT_COMMAND,
+ .positional_args = 1,
+ .subtests = 0,
+ .block_allowed = FALSE,
+ .block_required = FALSE,
+ .validate = cmd_redirect_validate,
+ .generate = cmd_redirect_generate
};
/*
diff -r 65bc76bb3345 -r 08a93ad9f84f src/lib-sieve/cmd-require.c
--- a/src/lib-sieve/cmd-require.c Fri Jan 08 20:49:39 2016 +0100
+++ b/src/lib-sieve/cmd-require.c Fri Jan 08 20:49:39 2016 +0100
@@ -20,12 +20,13 @@
(struct sieve_validator *valdtr, struct sieve_command *cmd);
const struct sieve_command_def cmd_require = {
- "require",
- SCT_COMMAND,
- 1, 0, FALSE, FALSE,
- NULL, NULL,
- cmd_require_validate,
- NULL, NULL, NULL
+ .identifier = "require",
+ .type = SCT_COMMAND,
+ .positional_args = 1,
+ .subtests = 0,
+ .block_allowed = FALSE,
+ .block_required = FALSE,
+ .validate = cmd_require_validate
};
/*
diff -r 65bc76bb3345 -r 08a93ad9f84f 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
@@ -21,14 +21,14 @@
(struct sieve_validator *valdtr, struct sieve_command *cmd);
const struct sieve_command_def cmd_stop = {
- "stop",
- SCT_COMMAND,
- 0, 0, FALSE, FALSE,
- NULL, NULL,
- cmd_stop_validate,
- NULL,
- cmd_stop_generate,
- NULL
+ .identifier = "stop",
+ .type = SCT_COMMAND,
+ .positional_args = 0,
+ .subtests = 0,
+ .block_allowed = FALSE,
+ .block_required = FALSE,
+ .validate = cmd_stop_validate,
+ .generate = cmd_stop_generate
};
/*
diff -r 65bc76bb3345 -r 08a93ad9f84f 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
@@ -79,15 +79,15 @@
(const struct sieve_codegen_env *cgenv, struct sieve_command *ctx);
static const struct sieve_command_def envelope_test = {
- "envelope",
- SCT_TEST,
- 2, 0, FALSE, FALSE,
- tst_envelope_registered,
- NULL,
- tst_envelope_validate,
- NULL,
- tst_envelope_generate,
- NULL
+ .identifier = "envelope",
+ .type = SCT_TEST,
+ .positional_args= 2,
+ .subtests = 0,
+ .block_allowed = FALSE,
+ .block_required = FALSE,
+ .registered = tst_envelope_registered,
+ .validate = tst_envelope_validate,
+ .generate = tst_envelope_generate
};
/*
diff -r 65bc76bb3345 -r 08a93ad9f84f 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
@@ -71,14 +71,14 @@
(const struct sieve_codegen_env *cgenv, struct sieve_command *ctx);
static const struct sieve_command_def fileinto_command = {
- "fileinto",
- SCT_COMMAND,
- 1, 0, FALSE, FALSE,
- NULL, NULL,
- cmd_fileinto_validate,
- NULL,
- cmd_fileinto_generate,
- NULL
+ .identifier = "fileinto",
+ .type = SCT_COMMAND,
+ .positional_args = 1,
+ .subtests = 0,
+ .block_allowed = FALSE,
+ .block_required = FALSE,
+ .validate = cmd_fileinto_validate,
+ .generate = cmd_fileinto_generate
};
/*
diff -r 65bc76bb3345 -r 08a93ad9f84f 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
@@ -108,14 +108,14 @@
*/
static const struct sieve_command_def reject_command = {
- "reject",
- SCT_COMMAND,
- 1, 0, FALSE, FALSE,
- NULL, NULL,
- cmd_reject_validate,
- NULL,
- cmd_reject_generate,
- NULL
+ .identifier = "reject",
+ .type = SCT_COMMAND,
+ .positional_args = 1,
+ .subtests = 0,
+ .block_allowed = FALSE,
+ .block_required = FALSE,
+ .validate = cmd_reject_validate,
+ .generate = cmd_reject_generate
};
/* EReject command
@@ -125,14 +125,14 @@
*/
static const struct sieve_command_def ereject_command = {
- "ereject",
- SCT_COMMAND,
- 1, 0, FALSE, FALSE,
- NULL, NULL,
- cmd_reject_validate,
- NULL,
- cmd_reject_generate,
- NULL
+ .identifier = "ereject",
+ .type = SCT_COMMAND,
+ .positional_args = 1,
+ .subtests = 0,
+ .block_allowed = FALSE,
+ .block_required = FALSE,
+ .validate = cmd_reject_validate,
+ .generate = cmd_reject_generate,
};
More information about the dovecot-cvs
mailing list