dovecot-2.0-pigeonhole: Adjusted string matching API tu use runt...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Thu Jul 15 00:55:27 EEST 2010
details: http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/a688d1de8747
changeset: 1331:a688d1de8747
user: Stephan Bosch <stephan at rename-it.nl>
date: Wed Jul 14 23:55:21 2010 +0200
description:
Adjusted string matching API tu use runtime environment.
diffstat:
src/lib-sieve/ext-envelope.c | 2 +-
src/lib-sieve/mcht-matches.c | 4 +-
src/lib-sieve/plugins/body/tst-body.c | 6 +-
src/lib-sieve/plugins/date/tst-date.c | 2 +-
src/lib-sieve/plugins/enotify/tst-notify-method-capability.c | 2 +-
src/lib-sieve/plugins/environment/tst-environment.c | 2 +-
src/lib-sieve/plugins/imap4flags/tst-hasflag.c | 2 +-
src/lib-sieve/plugins/notify/cmd-denotify.c | 2 +-
src/lib-sieve/plugins/regex/mcht-regex.c | 6 +-
src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c | 2 +-
src/lib-sieve/plugins/variables/ext-variables-common.c | 2 +-
src/lib-sieve/plugins/variables/ext-variables-operands.c | 2 +-
src/lib-sieve/plugins/variables/tst-string.c | 2 +-
src/lib-sieve/sieve-match-types.c | 20 +++++-----
src/lib-sieve/sieve-match-types.h | 10 ++--
src/lib-sieve/sieve-match.c | 4 +-
src/lib-sieve/sieve-match.h | 5 +-
src/lib-sieve/tst-address.c | 2 +-
src/lib-sieve/tst-header.c | 2 +-
src/testsuite/tst-test-error.c | 2 +-
src/testsuite/tst-test-result.c | 2 +-
21 files changed, 42 insertions(+), 41 deletions(-)
diffs (truncated from 392 to 300 lines):
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/ext-envelope.c
--- a/src/lib-sieve/ext-envelope.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/ext-envelope.c Wed Jul 14 23:55:21 2010 +0200
@@ -449,7 +449,7 @@
sieve_runtime_trace(renv, SIEVE_TRLVL_TESTS, "envelope test");
/* Initialize match */
- mctx = sieve_match_begin(renv->interp, &mcht, &cmp, NULL, key_list);
+ mctx = sieve_match_begin(renv, &mcht, &cmp, NULL, key_list);
/* Iterate through all requested headers to match */
envp_item = NULL;
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/mcht-matches.c
--- a/src/lib-sieve/mcht-matches.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/mcht-matches.c Wed Jul 14 23:55:21 2010 +0200
@@ -121,7 +121,7 @@
pvp = val; /* Previous value Pointer */
/* Start match values list if requested */
- if ( (mvalues = sieve_match_values_start(mctx->interp)) != NULL ) {
+ if ( (mvalues = sieve_match_values_start(mctx->runenv)) != NULL ) {
/* Skip ${0} for now; added when match succeeds */
sieve_match_values_add(mvalues, NULL);
@@ -425,7 +425,7 @@
sieve_match_values_set(mvalues, 0, matched);
/* Commit new match values */
- sieve_match_values_commit(mctx->interp, &mvalues);
+ sieve_match_values_commit(mctx->runenv, &mvalues);
}
return TRUE;
}
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/body/tst-body.c
--- a/src/lib-sieve/plugins/body/tst-body.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/body/tst-body.c Wed Jul 14 23:55:21 2010 +0200
@@ -398,12 +398,12 @@
/* Disable match values processing as required by RFC */
- mvalues_active = sieve_match_values_set_enabled(renv->interp, FALSE);
+ mvalues_active = sieve_match_values_set_enabled(renv, FALSE);
/* Iterate through all requested body parts to match */
matched = FALSE;
- mctx = sieve_match_begin(renv->interp, &mtch, &cmp, NULL, key_list);
+ mctx = sieve_match_begin(renv, &mtch, &cmp, NULL, key_list);
while ( !matched && body_parts->content != NULL ) {
if ( (mret=sieve_match_value(mctx, body_parts->content, body_parts->size))
< 0)
@@ -425,7 +425,7 @@
/* Restore match values processing */
- (void)sieve_match_values_set_enabled(renv->interp, mvalues_active);
+ (void)sieve_match_values_set_enabled(renv, mvalues_active);
/* Set test result */
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/date/tst-date.c
--- a/src/lib-sieve/plugins/date/tst-date.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/date/tst-date.c Wed Jul 14 23:55:21 2010 +0200
@@ -518,7 +518,7 @@
}
/* Initialize match */
- mctx = sieve_match_begin(renv->interp, &mcht, &cmp, NULL, key_list);
+ mctx = sieve_match_begin(renv, &mcht, &cmp, NULL, key_list);
if ( got_date && part_value != NULL ) {
/* Match value */
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/enotify/tst-notify-method-capability.c
--- a/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/enotify/tst-notify-method-capability.c Wed Jul 14 23:55:21 2010 +0200
@@ -228,7 +228,7 @@
(renv, 0 /* FIXME */, notify_uri, str_c(notify_capability));
if ( cap_value != NULL ) {
- mctx = sieve_match_begin(renv->interp, &mcht, &cmp, NULL, key_list);
+ mctx = sieve_match_begin(renv, &mcht, &cmp, NULL, key_list);
if ( (mret=sieve_match_value(mctx, cap_value, strlen(cap_value))) < 0 )
result = FALSE;
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/environment/tst-environment.c
--- a/src/lib-sieve/plugins/environment/tst-environment.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/environment/tst-environment.c Wed Jul 14 23:55:21 2010 +0200
@@ -201,7 +201,7 @@
(this_ext, str_c(name), renv->scriptenv);
if ( env_item != NULL ) {
- mctx = sieve_match_begin(renv->interp, &mcht, &cmp, NULL, key_list);
+ mctx = sieve_match_begin(renv, &mcht, &cmp, NULL, key_list);
if ( (mret=sieve_match_value(mctx, strlen(env_item) == 0 ? NULL : env_item,
strlen(env_item))) < 0 ) {
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/imap4flags/tst-hasflag.c
--- a/src/lib-sieve/plugins/imap4flags/tst-hasflag.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/imap4flags/tst-hasflag.c Wed Jul 14 23:55:21 2010 +0200
@@ -261,7 +261,7 @@
matched = FALSE;
mctx = sieve_match_begin
- (renv->interp, &mtch, &cmp, &_flag_extractor, flag_list);
+ (renv, &mtch, &cmp, &_flag_extractor, flag_list);
matched = FALSE;
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/notify/cmd-denotify.c
--- a/src/lib-sieve/plugins/notify/cmd-denotify.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/notify/cmd-denotify.c Wed Jul 14 23:55:21 2010 +0200
@@ -339,7 +339,7 @@
if ( match_key != NULL ) {
/* Initialize match */
- mctx = sieve_match_begin(renv->interp, &mcht, &cmp, NULL, match_key);
+ mctx = sieve_match_begin(renv, &mcht, &cmp, NULL, match_key);
/* Iterate through all actions */
rictx = sieve_result_iterate_init(renv->result);
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/regex/mcht-regex.c
--- a/src/lib-sieve/plugins/regex/mcht-regex.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/regex/mcht-regex.c Wed Jul 14 23:55:21 2010 +0200
@@ -189,7 +189,7 @@
ctx->value_index = -1;
/* Create storage for match values if match values are requested */
- if ( sieve_match_values_are_enabled(mctx->interp) ) {
+ if ( sieve_match_values_are_enabled(mctx->runenv) ) {
ctx->pmatch = p_new(pool, regmatch_t, MCHT_REGEX_MAX_SUBSTITUTIONS);
ctx->nmatch = MCHT_REGEX_MAX_SUBSTITUTIONS;
} else {
@@ -274,7 +274,7 @@
string_t *subst = t_str_new(32);
/* Start new list of match values */
- mvalues = sieve_match_values_start(mctx->interp);
+ mvalues = sieve_match_values_start(mctx->runenv);
i_assert( mvalues != NULL );
@@ -296,7 +296,7 @@
}
/* Substitute the new match values */
- sieve_match_values_commit(mctx->interp, &mvalues);
+ sieve_match_values_commit(mctx->runenv, &mvalues);
}
return TRUE;
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c
--- a/src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/spamvirustest/tst-spamvirustest.c Wed Jul 14 23:55:21 2010 +0200
@@ -283,7 +283,7 @@
(renv, SIEVE_TRLVL_TESTS, "%s test", sieve_operation_mnemonic(op));
/* Initialize match */
- mctx = sieve_match_begin(renv->interp, &mcht, &cmp, NULL, key_value);
+ mctx = sieve_match_begin(renv, &mcht, &cmp, NULL, key_value);
/* Perform match */
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/variables/ext-variables-common.c
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c Wed Jul 14 23:55:21 2010 +0200
@@ -723,7 +723,7 @@
(ext, renv->interp, scpbin);
/* Enable support for match values */
- (void) sieve_match_values_set_enabled(renv->interp, TRUE);
+ (void) sieve_match_values_set_enabled(renv, TRUE);
return TRUE;
}
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/variables/ext-variables-operands.c
--- a/src/lib-sieve/plugins/variables/ext-variables-operands.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/variables/ext-variables-operands.c Wed Jul 14 23:55:21 2010 +0200
@@ -246,7 +246,7 @@
* actually read the argument.
*/
if ( str != NULL ) {
- sieve_match_values_get(renv->interp, index, str);
+ sieve_match_values_get(renv, index, str);
if ( *str == NULL )
*str = t_str_new(0);
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/plugins/variables/tst-string.c
--- a/src/lib-sieve/plugins/variables/tst-string.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/plugins/variables/tst-string.c Wed Jul 14 23:55:21 2010 +0200
@@ -205,7 +205,7 @@
sieve_runtime_trace(renv, SIEVE_TRLVL_TESTS, "string test");
- mctx = sieve_match_begin(renv->interp, &mcht, &cmp, NULL, key_list);
+ mctx = sieve_match_begin(renv, &mcht, &cmp, NULL, key_list);
/* Iterate through all requested strings to match */
src_item = NULL;
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/sieve-match-types.c
--- a/src/lib-sieve/sieve-match-types.c Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/sieve-match-types.c Wed Jul 14 23:55:21 2010 +0200
@@ -185,10 +185,10 @@
*/
bool sieve_match_values_set_enabled
-(struct sieve_interpreter *interp, bool enable)
+(const struct sieve_runtime_env *renv, bool enable)
{
struct mtch_interpreter_context *ctx =
- get_interpreter_context(interp, enable);
+ get_interpreter_context(renv->interp, enable);
if ( ctx != NULL ) {
bool previous = ctx->match_values_enabled;
@@ -201,19 +201,19 @@
}
bool sieve_match_values_are_enabled
-(struct sieve_interpreter *interp)
+(const struct sieve_runtime_env *renv)
{
struct mtch_interpreter_context *ctx =
- get_interpreter_context(interp, FALSE);
+ get_interpreter_context(renv->interp, FALSE);
return ( ctx == NULL ? FALSE : ctx->match_values_enabled );
}
struct sieve_match_values *sieve_match_values_start
-(struct sieve_interpreter *interp)
+(const struct sieve_runtime_env *renv)
{
struct mtch_interpreter_context *ctx =
- get_interpreter_context(interp, FALSE);
+ get_interpreter_context(renv->interp, FALSE);
struct sieve_match_values *match_values;
if ( ctx == NULL || !ctx->match_values_enabled )
@@ -294,13 +294,13 @@
}
void sieve_match_values_commit
-(struct sieve_interpreter *interp, struct sieve_match_values **mvalues)
+(const struct sieve_runtime_env *renv, struct sieve_match_values **mvalues)
{
struct mtch_interpreter_context *ctx;
if ( (*mvalues) == NULL ) return;
- ctx = get_interpreter_context(interp, FALSE);
+ ctx = get_interpreter_context(renv->interp, FALSE);
if ( ctx == NULL || !ctx->match_values_enabled )
return;
@@ -323,10 +323,10 @@
}
void sieve_match_values_get
-(struct sieve_interpreter *interp, unsigned int index, string_t **value_r)
+(const struct sieve_runtime_env *renv, unsigned int index, string_t **value_r)
{
struct mtch_interpreter_context *ctx =
- get_interpreter_context(interp, FALSE);
+ get_interpreter_context(renv->interp, FALSE);
struct sieve_match_values *mvalues;
if ( ctx == NULL || ctx->match_values == NULL ) {
diff -r cec28cc5d4bf -r a688d1de8747 src/lib-sieve/sieve-match-types.h
--- a/src/lib-sieve/sieve-match-types.h Tue Jul 13 20:08:24 2010 +0200
+++ b/src/lib-sieve/sieve-match-types.h Wed Jul 14 23:55:21 2010 +0200
@@ -134,12 +134,12 @@
struct sieve_match_values;
bool sieve_match_values_set_enabled
- (struct sieve_interpreter *interp, bool enable);
+ (const struct sieve_runtime_env *renv, bool enable);
bool sieve_match_values_are_enabled
- (struct sieve_interpreter *interp);
+ (const struct sieve_runtime_env *renv);
struct sieve_match_values *sieve_match_values_start
- (struct sieve_interpreter *interp);
+ (const struct sieve_runtime_env *renv);
void sieve_match_values_set
(struct sieve_match_values *mvalues, unsigned int index, string_t *value);
void sieve_match_values_add
@@ -150,12 +150,12 @@
(struct sieve_match_values *mvalues, int num);
void sieve_match_values_commit
- (struct sieve_interpreter *interp, struct sieve_match_values **mvalues);
+ (const struct sieve_runtime_env *renv, struct sieve_match_values **mvalues);
void sieve_match_values_abort
(struct sieve_match_values **mvalues);
void sieve_match_values_get
- (struct sieve_interpreter *interp, unsigned int index, string_t **value_r);
+ (const struct sieve_runtime_env *renv, unsigned int index, string_t **value_r);
/*
More information about the dovecot-cvs
mailing list