dovecot-2.2-pigeonhole: lib-sieve: Restructured native extension...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/6bdcdfeaf5d7
changeset: 1898:6bdcdfeaf5d7
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Wed Jul 30 00:15:08 2014 +0200
description:
lib-sieve: Restructured native extension declarations a bit.

diffstat:

 src/lib-sieve/ext-encoded-character.c |   2 +-
 src/lib-sieve/sieve-extensions.c      |  56 ++++++++++++++++------------------
 2 files changed, 27 insertions(+), 31 deletions(-)

diffs (117 lines):

diff -r 77e6a42bff9b -r 6bdcdfeaf5d7 src/lib-sieve/ext-encoded-character.c
--- a/src/lib-sieve/ext-encoded-character.c	Tue Jul 29 01:34:25 2014 +0200
+++ b/src/lib-sieve/ext-encoded-character.c	Wed Jul 30 00:15:08 2014 +0200
@@ -27,7 +27,7 @@
 static bool ext_encoded_character_validator_load
 	(const struct sieve_extension *ext, struct sieve_validator *valdtr);
 
-struct sieve_extension_def encoded_character_extension = {
+const struct sieve_extension_def encoded_character_extension = {
 	.name = "encoded-character",
 	.validator_load = ext_encoded_character_validator_load,
 };
diff -r 77e6a42bff9b -r 6bdcdfeaf5d7 src/lib-sieve/sieve-extensions.c
--- a/src/lib-sieve/sieve-extensions.c	Tue Jul 29 01:34:25 2014 +0200
+++ b/src/lib-sieve/sieve-extensions.c	Wed Jul 30 00:15:08 2014 +0200
@@ -58,29 +58,38 @@
 
 /* FIXME: This is stupid. Define a comparator-* extension and be done with it */
 
-static const struct sieve_extension_def comparator_i_octet_extension = {
+const struct sieve_extension_def comparator_i_octet_extension = {
 	.name = "comparator-i;octet",
 };
 
-static const struct sieve_extension_def comparator_i_ascii_casemap_extension = {
+const struct sieve_extension_def comparator_i_ascii_casemap_extension = {
 	.name = "comparator-i;ascii-casemap",
 };
 
 /*
- * Core extensions
+ * List of native extensions
  */
 
+/* Dummy extensions */
+
+extern const struct sieve_extension_def comparator_i_octet_extension;
+extern const struct sieve_extension_def comparator_i_ascii_casemap_extension;
+
+const struct sieve_extension_def *sieve_dummy_extensions[] = {
+	&comparator_i_octet_extension, &comparator_i_ascii_casemap_extension
+};
+
+const unsigned int sieve_dummy_extensions_count =
+	N_ELEMENTS(sieve_dummy_extensions);
+
+/* Core */
+
 extern const struct sieve_extension_def fileinto_extension;
 extern const struct sieve_extension_def reject_extension;
 extern const struct sieve_extension_def envelope_extension;
 extern const struct sieve_extension_def encoded_character_extension;
 
-/*
- * Native 'plugin' extensions
- */
-
 extern const struct sieve_extension_def vacation_extension;
-extern const struct sieve_extension_def vacation_seconds_extension;
 extern const struct sieve_extension_def subaddress_extension;
 extern const struct sieve_extension_def comparator_i_ascii_numeric_extension;
 extern const struct sieve_extension_def relational_extension;
@@ -94,31 +103,9 @@
 extern const struct sieve_extension_def environment_extension;
 extern const struct sieve_extension_def mailbox_extension;
 extern const struct sieve_extension_def date_extension;
-extern const struct sieve_extension_def spamtest_extension;
-extern const struct sieve_extension_def spamtestplus_extension;
-extern const struct sieve_extension_def virustest_extension;
 extern const struct sieve_extension_def ihave_extension;
-extern const struct sieve_extension_def editheader_extension;
 extern const struct sieve_extension_def duplicate_extension;
 
-/* vnd.dovecot. */
-extern const struct sieve_extension_def vnd_debug_extension;
-extern const struct sieve_extension_def vnd_duplicate_extension;
-
-/*
- * List of native extensions
- */
-
-const struct sieve_extension_def *sieve_dummy_extensions[] = {
-	/* Dummy extensions */
-	&comparator_i_octet_extension, &comparator_i_ascii_casemap_extension
-};
-
-const unsigned int sieve_dummy_extensions_count =
-	N_ELEMENTS(sieve_dummy_extensions);
-
-/* Core */
-
 const struct sieve_extension_def *sieve_core_extensions[] = {
 	/* Core extensions */
 	&fileinto_extension, &reject_extension, &envelope_extension,
@@ -141,6 +128,14 @@
  *   necessary to make these useful.
  */
 
+extern const struct sieve_extension_def vacation_seconds_extension;
+extern const struct sieve_extension_def spamtest_extension;
+extern const struct sieve_extension_def spamtestplus_extension;
+extern const struct sieve_extension_def virustest_extension;
+extern const struct sieve_extension_def editheader_extension;
+
+extern const struct sieve_extension_def vnd_debug_extension;
+
 const struct sieve_extension_def *sieve_extra_extensions[] = {
 	&vacation_seconds_extension, &spamtest_extension, &spamtestplus_extension,
 	&virustest_extension, &editheader_extension,
@@ -158,6 +153,7 @@
 
 extern const struct sieve_extension_def imapflags_extension;
 extern const struct sieve_extension_def notify_extension;
+extern const struct sieve_extension_def vnd_duplicate_extension;
 
 const struct sieve_extension_def *sieve_deprecated_extensions[] = {
 	&imapflags_extension,