From f0116c923d06878c3edb66ffc8940b323e2ad5cb Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 5 Apr 2020 23:35:17 +0200
Subject: [PATCH] lib-sieve: plugins: imap4flags: Reformat tst-hasflag.c.
---
.../plugins/imap4flags/tst-hasflag.c | 141 ++++++++++--------
1 file changed, 77 insertions(+), 64 deletions(-)
diff --git a/src/lib-sieve/plugins/imap4flags/tst-hasflag.c b/src/lib-sieve/plugins/imap4flags/tst-hasflag.c
index 23f2acc34..691c27b1a 100644
--- a/src/lib-sieve/plugins/imap4flags/tst-hasflag.c
+++ b/src/lib-sieve/plugins/imap4flags/tst-hasflag.c
@@ -24,13 +24,15 @@
* <list-of-flags: string-list>
*/
-static bool tst_hasflag_registered
- (struct sieve_validator *valdtr, const struct sieve_extension *ext,
- struct sieve_command_registration *cmd_reg);
-static bool tst_hasflag_validate
- (struct sieve_validator *valdtr, struct sieve_command *tst);
-static bool tst_hasflag_generate
- (const struct sieve_codegen_env *cgenv, struct sieve_command *cmd);
+static bool
+tst_hasflag_registered(struct sieve_validator *valdtr,
+ const struct sieve_extension *ext,
+ struct sieve_command_registration *cmd_reg);
+static bool
+tst_hasflag_validate(struct sieve_validator *valdtr, struct sieve_command *tst);
+static bool
+tst_hasflag_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_command *cmd);
const struct sieve_command_def tst_hasflag = {
.identifier = "hasflag",
@@ -41,24 +43,26 @@ const struct sieve_command_def tst_hasflag = {
.block_required = FALSE,
.registered = tst_hasflag_registered,
.validate = tst_hasflag_validate,
- .generate = tst_hasflag_generate
+ .generate = tst_hasflag_generate,
};
/*
* Hasflag operation
*/
-static bool tst_hasflag_operation_dump
- (const struct sieve_dumptime_env *denv, sieve_size_t *address);
-static int tst_hasflag_operation_execute
- (const struct sieve_runtime_env *renv, sieve_size_t *address);
+static bool
+tst_hasflag_operation_dump(const struct sieve_dumptime_env *denv,
+ sieve_size_t *address);
+static int
+tst_hasflag_operation_execute(const struct sieve_runtime_env *renv,
+ sieve_size_t *address);
const struct sieve_operation_def hasflag_operation = {
.mnemonic = "HASFLAG",
.ext_def = &imap4flags_extension,
.code = EXT_IMAP4FLAGS_OPERATION_HASFLAG,
.dump = tst_hasflag_operation_dump,
- .execute = tst_hasflag_operation_execute
+ .execute = tst_hasflag_operation_execute,
};
/*
@@ -73,13 +77,16 @@ enum tst_hasflag_optional {
* Tag registration
*/
-static bool tst_hasflag_registered
-(struct sieve_validator *valdtr, const struct sieve_extension *ext ATTR_UNUSED,
- struct sieve_command_registration *cmd_reg)
+static bool
+tst_hasflag_registered(struct sieve_validator *valdtr,
+ const struct sieve_extension *ext ATTR_UNUSED,
+ struct sieve_command_registration *cmd_reg)
{
/* The order of these is not significant */
- sieve_comparators_link_tag(valdtr, cmd_reg, SIEVE_MATCH_OPT_COMPARATOR);
- sieve_match_types_link_tags(valdtr, cmd_reg, SIEVE_MATCH_OPT_MATCH_TYPE);
+ sieve_comparators_link_tag(valdtr, cmd_reg,
+ SIEVE_MATCH_OPT_COMPARATOR);
+ sieve_match_types_link_tags(valdtr, cmd_reg,
+ SIEVE_MATCH_OPT_MATCH_TYPE);
return TRUE;
}
@@ -88,8 +95,9 @@ static bool tst_hasflag_registered
* Validation
*/
-static bool tst_hasflag_validate
-(struct sieve_validator *valdtr, struct sieve_command *tst)
+static bool
+tst_hasflag_validate(struct sieve_validator *valdtr,
+ struct sieve_command *tst)
{
struct sieve_ast_argument *vars = tst->first_positional;
struct sieve_ast_argument *keys = sieve_ast_argument_next(vars);
@@ -98,10 +106,10 @@ static bool tst_hasflag_validate
const struct sieve_comparator cmp_default =
SIEVE_COMPARATOR_DEFAULT(i_ascii_casemap_comparator);
- if ( !ext_imap4flags_command_validate(valdtr, tst) )
+ if (!ext_imap4flags_command_validate(valdtr, tst))
return FALSE;
- if ( keys == NULL ) {
+ if (keys == NULL) {
keys = vars;
vars = NULL;
} else {
@@ -109,32 +117,31 @@ static bool tst_hasflag_validate
}
/* Validate the key argument to a specified match type */
- return sieve_match_type_validate
- (valdtr, tst, keys, &mcht_default, &cmp_default);
+ return sieve_match_type_validate(valdtr, tst, keys,
+ &mcht_default, &cmp_default);
}
/*
* Code generation
*/
-static bool tst_hasflag_generate
-(const struct sieve_codegen_env *cgenv, struct sieve_command *cmd)
+static bool
+tst_hasflag_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_command *cmd)
{
sieve_operation_emit(cgenv->sblock, cmd->ext, &hasflag_operation);
/* Generate arguments */
- if ( !sieve_generate_arguments(cgenv, cmd, NULL) )
- return FALSE;
-
- return TRUE;
+ return sieve_generate_arguments(cgenv, cmd, NULL);
}
/*
* Code dump
*/
-static bool tst_hasflag_operation_dump
-(const struct sieve_dumptime_env *denv, sieve_size_t *address)
+static bool
+tst_hasflag_operation_dump(const struct sieve_dumptime_env *denv,
+ sieve_size_t *address)
{
int opt_code = 0;
@@ -147,33 +154,35 @@ static bool tst_hasflag_operation_dump
bool opok = TRUE;
int opt;
- if ( (opt=sieve_match_opr_optional_dump(denv, address, &opt_code))
- < 0 )
+ opt = sieve_match_opr_optional_dump(denv, address, &opt_code);
+ if (opt < 0)
return FALSE;
+ if (opt == 0)
+ break;
- if ( opt == 0 ) break;
-
- switch ( opt_code ) {
+ switch (opt_code) {
case OPT_VARIABLES:
- opok = sieve_opr_stringlist_dump(denv, address, "variables");
+ opok = sieve_opr_stringlist_dump(denv, address,
+ "variables");
break;
default:
return FALSE;
}
- if ( !opok ) return FALSE;
+ if (!opok)
+ return FALSE;
}
- return
- sieve_opr_stringlist_dump(denv, address, "list of flags");
+ return sieve_opr_stringlist_dump(denv, address, "list of flags");
}
/*
* Interpretation
*/
-static int tst_hasflag_operation_execute
-(const struct sieve_runtime_env *renv, sieve_size_t *address)
+static int
+tst_hasflag_operation_execute(const struct sieve_runtime_env *renv,
+ sieve_size_t *address)
{
const struct sieve_operation *op = renv->oprtn;
int opt_code = 0;
@@ -181,7 +190,8 @@ static int tst_hasflag_operation_execute
SIEVE_COMPARATOR_DEFAULT(i_ascii_casemap_comparator);
struct sieve_match_type mcht =
SIEVE_MATCH_TYPE_DEFAULT(is_match_type);
- struct sieve_stringlist *flag_list, *variables_list, *value_list, *key_list;
+ struct sieve_stringlist *flag_list, *variables_list, *value_list,
+ *key_list;
int match, ret;
/*
@@ -194,29 +204,33 @@ static int tst_hasflag_operation_execute
for (;;) {
int opt;
- if ( (opt=sieve_match_opr_optional_read
- (renv, address, &opt_code, &ret, &cmp, &mcht)) < 0 )
+ opt = sieve_match_opr_optional_read(renv, address, &opt_code,
+ &ret, &cmp, &mcht);
+ if (opt < 0)
return ret;
+ if (opt == 0)
+ break;
- if ( opt == 0 ) break;
-
- switch ( opt_code ) {
+ switch (opt_code) {
case OPT_VARIABLES:
- ret = sieve_opr_stringlist_read
- (renv, address, "variables-list", &variables_list);
+ ret = sieve_opr_stringlist_read(
+ renv, address, "variables-list",
+ &variables_list);
break;
default:
- sieve_runtime_trace_error(renv, "invalid optional operand");
+ sieve_runtime_trace_error(
+ renv, "invalid optional operand");
ret = SIEVE_EXEC_BIN_CORRUPT;
}
- if ( ret <= 0 ) return ret;
+ if (ret <= 0)
+ return ret;
}
/* Fixed operands */
- if ( (ret=sieve_opr_stringlist_read(renv, address, "flag-list", &flag_list))
- <= 0 )
+ ret = sieve_opr_stringlist_read(renv, address, "flag-list", &flag_list);
+ if (ret <= 0)
return ret;
/*
@@ -225,24 +239,23 @@ static int tst_hasflag_operation_execute
sieve_runtime_trace(renv, SIEVE_TRLVL_TESTS, "hasflag test");
- value_list = sieve_ext_imap4flags_get_flags
- (renv, op->ext, variables_list);
+ value_list = sieve_ext_imap4flags_get_flags(renv, op->ext,
+ variables_list);
- if ( sieve_match_type_is(&mcht, is_match_type) ||
- sieve_match_type_is(&mcht, contains_match_type) ) {
- key_list = sieve_ext_imap4flags_get_flags
- (renv, op->ext, flag_list);
+ if (sieve_match_type_is(&mcht, is_match_type) ||
+ sieve_match_type_is(&mcht, contains_match_type)) {
+ key_list = sieve_ext_imap4flags_get_flags(
+ renv, op->ext, flag_list);
} else {
key_list = flag_list;
}
/* Perform match */
- if ( (match=sieve_match(renv, &mcht, &cmp, value_list, key_list, &ret)) < 0 )
+ match = sieve_match(renv, &mcht, &cmp, value_list, key_list, &ret);
+ if (match < 0)
return ret;
/* Set test result for subsequent conditional jump */
sieve_interpreter_set_test_result(renv->interp, match > 0);
return SIEVE_EXEC_OK;
}
-
-
--
GitLab