dovecot-1.2-sieve: Spamtest and virustest extensions: changed se...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-1.2-sieve/rev/788e36bc6730
changeset: 1242:788e36bc6730
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sun Mar 14 17:13:49 2010 +0100
description:
Spamtest and virustest extensions: changed setting names.

diffstat:

 src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c |  8 ++++----
 tests/extensions/spamvirustest/spamtest.svtest                 |  2 +-
 tests/extensions/spamvirustest/spamtestplus.svtest             |  2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 0f5f87cad820 -r 788e36bc6730 src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c
--- a/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c	Sun Mar 14 12:34:13 2010 +0100
+++ b/src/lib-sieve/plugins/spamvirustest/ext-spamvirustest-common.c	Sun Mar 14 17:13:49 2010 +0100
@@ -22,7 +22,7 @@
  */
 
 enum ext_spamvirustest_status_type {
-	EXT_SPAMVIRUSTEST_STATUS_TYPE_VALUE,
+	EXT_SPAMVIRUSTEST_STATUS_TYPE_SCORE,
 	EXT_SPAMVIRUSTEST_STATUS_TYPE_STRLEN,
 	EXT_SPAMVIRUSTEST_STATUS_TYPE_TEXT,
 };
@@ -292,8 +292,8 @@
 		return TRUE;
 	}
 
-	if ( status_type == NULL || strcmp(status_type, "value") == 0 ) {
-		type = EXT_SPAMVIRUSTEST_STATUS_TYPE_VALUE;
+	if ( status_type == NULL || strcmp(status_type, "score") == 0 ) {
+		type = EXT_SPAMVIRUSTEST_STATUS_TYPE_SCORE;
 	} else if ( strcmp(status_type, "strlen") == 0 ) {
 		type = EXT_SPAMVIRUSTEST_STATUS_TYPE_STRLEN;
 	} else if ( strcmp(status_type, "text") == 0 ) {
@@ -566,7 +566,7 @@
 	}
 
 	switch ( ext_data->status_type ) {
-	case EXT_SPAMVIRUSTEST_STATUS_TYPE_VALUE:
+	case EXT_SPAMVIRUSTEST_STATUS_TYPE_SCORE:
 		if ( !ext_spamvirustest_parse_decimal_value
 			(status, &status_value, &error) ) {
 			sieve_runtime_trace(renv, "%s: failed to parse status value '%s': %s", 
diff -r 0f5f87cad820 -r 788e36bc6730 tests/extensions/spamvirustest/spamtest.svtest
--- a/tests/extensions/spamvirustest/spamtest.svtest	Sun Mar 14 12:34:13 2010 +0100
+++ b/tests/extensions/spamvirustest/spamtest.svtest	Sun Mar 14 17:13:49 2010 +0100
@@ -27,7 +27,7 @@
 	"X-SpamCheck:[ \\ta-zA-Z]+, score=(-?[0-9]+.[0-9]+)";
 test_config :set "sieve_spamtest_max_header"
 	"X-SpamCheck:[ \\ta-zA-Z]+, score=-?[0-9]+.[0-9]+ required=(-?[0-9]+.[0-9]+)";
-test_config :set "sieve_spamtest_status_type" "value";
+test_config :set "sieve_spamtest_status_type" "score";
 test_config :reload "spamtest";
 
 test "Value: subzero" {
diff -r 0f5f87cad820 -r 788e36bc6730 tests/extensions/spamvirustest/spamtestplus.svtest
--- a/tests/extensions/spamvirustest/spamtestplus.svtest	Sun Mar 14 12:34:13 2010 +0100
+++ b/tests/extensions/spamvirustest/spamtestplus.svtest	Sun Mar 14 17:13:49 2010 +0100
@@ -26,7 +26,7 @@
 
 test_config :set "sieve_spamtest_status_header" "X-SpamCheck";
 test_config :set "sieve_spamtest_max_value" "1";
-test_config :set "sieve_spamtest_status_type" "value";
+test_config :set "sieve_spamtest_status_type" "score";
 test_config :reload "spamtestplus";
 
 test "Value percent: .00" {