dovecot-2.2-pigeonhole: lib-sieve: Cleaned up command argument d...
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/65bc76bb3345
changeset: 2209:65bc76bb3345
user: Stephan Bosch <stephan at rename-it.nl>
date: Fri Jan 08 20:49:39 2016 +0100
description:
lib-sieve: Cleaned up command argument definitions using newer C99 syntax.
diffstat:
src/lib-sieve/ext-encoded-character.c | 6 +-
src/lib-sieve/plugins/body/tst-body.c | 24 +++-----
src/lib-sieve/plugins/copy/ext-copy.c | 8 +-
src/lib-sieve/plugins/date/tst-date.c | 16 ++---
src/lib-sieve/plugins/duplicate/tst-duplicate.c | 33 +++-------
src/lib-sieve/plugins/editheader/cmd-addheader.c | 3 +-
src/lib-sieve/plugins/editheader/cmd-deleteheader.c | 12 +--
src/lib-sieve/plugins/enotify/cmd-notify.c | 24 ++-----
src/lib-sieve/plugins/imap4flags/tag-flags.c | 15 ++---
src/lib-sieve/plugins/include/cmd-include.c | 25 ++-----
src/lib-sieve/plugins/index/tag-index.c | 15 +---
src/lib-sieve/plugins/mailbox/tag-mailbox-create.c | 8 +-
src/lib-sieve/plugins/mime/cmd-break.c | 6 +-
src/lib-sieve/plugins/mime/cmd-foreverypart.c | 6 +-
src/lib-sieve/plugins/mime/tag-mime.c | 38 ++++--------
src/lib-sieve/plugins/notify/cmd-denotify.c | 7 +-
src/lib-sieve/plugins/notify/cmd-notify.c | 24 ++-----
src/lib-sieve/plugins/notify/ext-notify-common.c | 18 ++----
src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c | 6 +-
src/lib-sieve/plugins/vacation/cmd-vacation.c | 42 ++++---------
src/lib-sieve/plugins/variables/cmd-set.c | 7 +-
src/lib-sieve/plugins/variables/ext-variables-arguments.c | 18 ++---
src/lib-sieve/plugins/variables/ext-variables-namespaces.c | 5 +-
src/lib-sieve/sieve-address-parts.c | 9 +-
src/lib-sieve/sieve-commands.c | 18 ++---
src/lib-sieve/sieve-comparators.c | 8 +-
src/lib-sieve/sieve-match-types.c | 9 +-
src/lib-sieve/sieve-validator.c | 6 +-
src/lib-sieve/tst-size.c | 12 +--
src/plugins/sieve-extprograms/cmd-execute.c | 22 ++----
src/plugins/sieve-extprograms/cmd-pipe.c | 3 +-
src/testsuite/cmd-test-config.c | 6 +-
src/testsuite/cmd-test-imap-metadata.c | 6 +-
src/testsuite/cmd-test-message.c | 12 +--
src/testsuite/testsuite-arguments.c | 8 +-
src/testsuite/testsuite-objects.c | 5 +-
src/testsuite/testsuite-substitutions.c | 5 +-
src/testsuite/tst-test-error.c | 6 +-
src/testsuite/tst-test-result-action.c | 6 +-
src/testsuite/tst-test-script-run.c | 3 +-
40 files changed, 181 insertions(+), 329 deletions(-)
diffs (truncated from 1057 to 300 lines):
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/ext-encoded-character.c
--- a/src/lib-sieve/ext-encoded-character.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/ext-encoded-character.c Fri Jan 08 20:49:39 2016 +0100
@@ -41,10 +41,8 @@
struct sieve_command *context);
const struct sieve_argument_def encoded_string_argument = {
- "@encoded-string",
- NULL,
- arg_encoded_string_validate,
- NULL, NULL, NULL
+ .identifier = "@encoded-string",
+ .validate = arg_encoded_string_validate
};
/* Parsing */
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/plugins/body/tst-body.c
--- a/src/lib-sieve/plugins/body/tst-body.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/plugins/body/tst-body.c Fri Jan 08 20:49:39 2016 +0100
@@ -87,27 +87,21 @@
/* Argument objects */
static const struct sieve_argument_def body_raw_tag = {
- "raw",
- NULL,
- tag_body_transform_validate,
- NULL, NULL,
- tag_body_transform_generate
+ .identifier = "raw",
+ .validate = tag_body_transform_validate,
+ .generate = tag_body_transform_generate
};
static const struct sieve_argument_def body_content_tag = {
- "content",
- NULL,
- tag_body_transform_validate,
- NULL, NULL,
- tag_body_transform_generate
+ .identifier = "content",
+ .validate = tag_body_transform_validate,
+ .generate = tag_body_transform_generate
};
static const struct sieve_argument_def body_text_tag = {
- "text",
- NULL,
- tag_body_transform_validate,
- NULL, NULL,
- tag_body_transform_generate
+ .identifier = "text",
+ .validate = tag_body_transform_validate,
+ .generate = tag_body_transform_generate
};
/* Argument implementation */
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/plugins/copy/ext-copy.c
--- a/src/lib-sieve/plugins/copy/ext-copy.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/plugins/copy/ext-copy.c Fri Jan 08 20:49:39 2016 +0100
@@ -92,11 +92,9 @@
struct sieve_command *cmd);
static const struct sieve_argument_def copy_tag = {
- "copy",
- NULL,
- tag_copy_validate,
- NULL, NULL,
- tag_copy_generate
+ .identifier = "copy",
+ .validate = tag_copy_validate,
+ .generate = tag_copy_generate
};
/*
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/plugins/date/tst-date.c
--- a/src/lib-sieve/plugins/date/tst-date.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/plugins/date/tst-date.c Fri Jan 08 20:49:39 2016 +0100
@@ -94,19 +94,15 @@
/* Argument objects */
static const struct sieve_argument_def date_zone_tag = {
- "zone",
- NULL,
- tag_zone_validate,
- NULL, NULL,
- tag_zone_generate
+ .identifier = "zone",
+ .validate = tag_zone_validate,
+ .generate = tag_zone_generate
};
static const struct sieve_argument_def date_originalzone_tag = {
- "originalzone",
- NULL,
- tag_zone_validate,
- NULL, NULL,
- tag_zone_generate
+ .identifier = "originalzone",
+ .validate = tag_zone_validate,
+ .generate = tag_zone_generate
};
/*
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/plugins/duplicate/tst-duplicate.c
--- a/src/lib-sieve/plugins/duplicate/tst-duplicate.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/plugins/duplicate/tst-duplicate.c Fri Jan 08 20:49:39 2016 +0100
@@ -52,43 +52,32 @@
struct sieve_command *cmd);
static const struct sieve_argument_def duplicate_seconds_tag = {
- "seconds",
- NULL,
- tst_duplicate_validate_number_tag,
- NULL, NULL, NULL,
+ .identifier = "seconds",
+ .validate = tst_duplicate_validate_number_tag
};
static const struct sieve_argument_def duplicate_header_tag = {
- "header",
- NULL,
- tst_duplicate_validate_string_tag,
- NULL, NULL, NULL
+ .identifier = "header",
+ .validate = tst_duplicate_validate_string_tag
};
static const struct sieve_argument_def duplicate_uniqueid_tag = {
- "uniqueid",
- NULL,
- tst_duplicate_validate_string_tag,
- NULL, NULL, NULL
+ .identifier = "uniqueid",
+ .validate = tst_duplicate_validate_string_tag
};
static const struct sieve_argument_def duplicate_value_tag = {
- "value", /* vnd.dovecot.duplicate (deprecated) */
- NULL,
- tst_duplicate_validate_string_tag,
- NULL, NULL, NULL
+ .identifier = "value", /* vnd.dovecot.duplicate (deprecated) */
+ .validate = tst_duplicate_validate_string_tag
};
static const struct sieve_argument_def duplicate_handle_tag = {
- "handle",
- NULL,
- tst_duplicate_validate_string_tag,
- NULL, NULL, NULL
+ .identifier = "handle",
+ .validate = tst_duplicate_validate_string_tag
};
static const struct sieve_argument_def duplicate_last_tag = {
- "last",
- NULL, NULL, NULL, NULL, NULL
+ .identifier = "last"
};
/* Codes for optional arguments */
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/plugins/editheader/cmd-addheader.c
--- a/src/lib-sieve/plugins/editheader/cmd-addheader.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/plugins/editheader/cmd-addheader.c Fri Jan 08 20:49:39 2016 +0100
@@ -55,8 +55,7 @@
/* Argument objects */
static const struct sieve_argument_def addheader_last_tag = {
- "last",
- NULL, NULL, NULL, NULL, NULL
+ .identifier = "last"
};
/* Codes for optional arguments */
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/plugins/editheader/cmd-deleteheader.c
--- a/src/lib-sieve/plugins/editheader/cmd-deleteheader.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/plugins/editheader/cmd-deleteheader.c Fri Jan 08 20:49:39 2016 +0100
@@ -69,17 +69,13 @@
/* Argument objects */
static const struct sieve_argument_def deleteheader_index_tag = {
- "index",
- NULL,
- cmd_deleteheader_validate_index_tag,
- NULL, NULL, NULL
+ .identifier = "index",
+ .validate = cmd_deleteheader_validate_index_tag
};
static const struct sieve_argument_def deleteheader_last_tag = {
- "last",
- NULL,
- cmd_deleteheader_validate_last_tag,
- NULL, NULL, NULL
+ .identifier = "last",
+ .validate = cmd_deleteheader_validate_last_tag
};
/* Codes for optional arguments */
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/plugins/enotify/cmd-notify.c
--- a/src/lib-sieve/plugins/enotify/cmd-notify.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/plugins/enotify/cmd-notify.c Fri Jan 08 20:49:39 2016 +0100
@@ -79,31 +79,23 @@
/* Argument objects */
static const struct sieve_argument_def notify_from_tag = {
- "from",
- NULL,
- cmd_notify_validate_string_tag,
- NULL, NULL, NULL
+ .identifier = "from",
+ .validate = cmd_notify_validate_string_tag
};
static const struct sieve_argument_def notify_options_tag = {
- "options",
- NULL,
- cmd_notify_validate_stringlist_tag,
- NULL, NULL, NULL
+ .identifier = "options",
+ .validate = cmd_notify_validate_stringlist_tag
};
static const struct sieve_argument_def notify_message_tag = {
- "message",
- NULL,
- cmd_notify_validate_string_tag,
- NULL, NULL, NULL
+ .identifier = "message",
+ .validate = cmd_notify_validate_string_tag
};
static const struct sieve_argument_def notify_importance_tag = {
- "importance",
- NULL,
- cmd_notify_validate_importance_tag,
- NULL, NULL, NULL
+ .identifier = "importance",
+ .validate = cmd_notify_validate_importance_tag
};
/*
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/plugins/imap4flags/tag-flags.c
--- a/src/lib-sieve/plugins/imap4flags/tag-flags.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/plugins/imap4flags/tag-flags.c Fri Jan 08 20:49:39 2016 +0100
@@ -36,18 +36,15 @@
struct sieve_command *cmd);
const struct sieve_argument_def tag_flags = {
- "flags",
- NULL,
- tag_flags_validate,
- NULL, NULL,
- tag_flags_generate
+ .identifier = "flags",
+ .validate = tag_flags_validate,
+ .generate = tag_flags_generate
};
const struct sieve_argument_def tag_flags_implicit = {
- "flags-implicit",
- NULL, NULL, NULL,
- tag_flags_validate_persistent,
- tag_flags_generate
+ .identifier = "flags-implicit",
+ .validate_persistent = tag_flags_validate_persistent,
+ .generate = tag_flags_generate
};
/*
diff -r 7c9e740b8653 -r 65bc76bb3345 src/lib-sieve/plugins/include/cmd-include.c
--- a/src/lib-sieve/plugins/include/cmd-include.c Fri Jan 08 20:07:51 2016 +0100
+++ b/src/lib-sieve/plugins/include/cmd-include.c Fri Jan 08 20:49:39 2016 +0100
@@ -91,17 +91,13 @@
struct sieve_command *cmd);
static const struct sieve_argument_def include_personal_tag = {
- "personal",
- NULL,
- cmd_include_validate_location_tag,
- NULL, NULL, NULL
+ .identifier = "personal",
+ .validate = cmd_include_validate_location_tag
};
static const struct sieve_argument_def include_global_tag = {
- "global",
- NULL,
- cmd_include_validate_location_tag,
- NULL, NULL, NULL
+ .identifier = "global",
+ .validate = cmd_include_validate_location_tag
};
static bool cmd_include_validate_boolean_tag
@@ -109,20 +105,15 @@
struct sieve_command *cmd);
static const struct sieve_argument_def include_once_tag = {
- "once",
More information about the dovecot-cvs
mailing list