From e9685fe624a87ec00d1fca918db7f6b81ed5d539 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Wed, 23 Jun 2021 02:48:51 +0200
Subject: [PATCH] testsuite: Reformat cmd-test-binary.c
---
src/testsuite/cmd-test-binary.c | 90 +++++++++++++++++++--------------
1 file changed, 52 insertions(+), 38 deletions(-)
diff --git a/src/testsuite/cmd-test-binary.c b/src/testsuite/cmd-test-binary.c
index 6f810bd22..7d76c4548 100644
--- a/src/testsuite/cmd-test-binary.c
+++ b/src/testsuite/cmd-test-binary.c
@@ -18,10 +18,12 @@
* Commands
*/
-static bool cmd_test_binary_validate
- (struct sieve_validator *valdtr, struct sieve_command *cmd);
-static bool cmd_test_binary_generate
- (const struct sieve_codegen_env *cgenv, struct sieve_command *ctx);
+static bool
+cmd_test_binary_validate(struct sieve_validator *valdtr,
+ struct sieve_command *cmd);
+static bool
+cmd_test_binary_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_command *ctx);
/* Test_binary_load command
*
@@ -37,7 +39,7 @@ const struct sieve_command_def cmd_test_binary_load = {
.block_allowed = FALSE,
.block_required = FALSE,
.validate = cmd_test_binary_validate,
- .generate = cmd_test_binary_generate
+ .generate = cmd_test_binary_generate,
};
/* Test_binary_save command
@@ -61,10 +63,12 @@ const struct sieve_command_def cmd_test_binary_save = {
* Operations
*/
-static bool cmd_test_binary_operation_dump
- (const struct sieve_dumptime_env *denv, sieve_size_t *address);
-static int cmd_test_binary_operation_execute
- (const struct sieve_runtime_env *renv, sieve_size_t *address);
+static bool
+cmd_test_binary_operation_dump(const struct sieve_dumptime_env *denv,
+ sieve_size_t *address);
+static int
+cmd_test_binary_operation_execute(const struct sieve_runtime_env *renv,
+ sieve_size_t *address);
/* test_binary_create operation */
@@ -73,7 +77,7 @@ const struct sieve_operation_def test_binary_load_operation = {
.ext_def = &testsuite_extension,
.code = TESTSUITE_OPERATION_TEST_BINARY_LOAD,
.dump = cmd_test_binary_operation_dump,
- .execute = cmd_test_binary_operation_execute
+ .execute = cmd_test_binary_operation_execute,
};
/* test_binary_delete operation */
@@ -83,22 +87,22 @@ const struct sieve_operation_def test_binary_save_operation = {
.ext_def = &testsuite_extension,
.code = TESTSUITE_OPERATION_TEST_BINARY_SAVE,
.dump = cmd_test_binary_operation_dump,
- .execute = cmd_test_binary_operation_execute
+ .execute = cmd_test_binary_operation_execute,
};
/*
* Validation
*/
-static bool cmd_test_binary_validate
-(struct sieve_validator *valdtr, struct sieve_command *cmd)
+static bool
+cmd_test_binary_validate(struct sieve_validator *valdtr,
+ struct sieve_command *cmd)
{
struct sieve_ast_argument *arg = cmd->first_positional;
- if ( !sieve_validate_positional_argument
- (valdtr, cmd, arg, "binary-name", 1, SAAT_STRING) ) {
+ if (!sieve_validate_positional_argument(valdtr, cmd, arg, "binary-name",
+ 1, SAAT_STRING))
return FALSE;
- }
return sieve_validator_argument_activate(valdtr, cmd, arg, FALSE);
}
@@ -107,19 +111,23 @@ static bool cmd_test_binary_validate
* Code generation
*/
-static bool cmd_test_binary_generate
-(const struct sieve_codegen_env *cgenv, struct sieve_command *cmd)
+static bool
+cmd_test_binary_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_command *cmd)
{
/* Emit operation */
- if ( sieve_command_is(cmd, cmd_test_binary_load) )
- sieve_operation_emit(cgenv->sblock, cmd->ext, &test_binary_load_operation);
- else if ( sieve_command_is(cmd, cmd_test_binary_save) )
- sieve_operation_emit(cgenv->sblock, cmd->ext, &test_binary_save_operation);
- else
+ if (sieve_command_is(cmd, cmd_test_binary_load)) {
+ sieve_operation_emit(cgenv->sblock, cmd->ext,
+ &test_binary_load_operation);
+ } else if (sieve_command_is(cmd, cmd_test_binary_save)) {
+ sieve_operation_emit(cgenv->sblock, cmd->ext,
+ &test_binary_save_operation);
+ } else {
i_unreached();
+ }
/* Generate arguments */
- if ( !sieve_generate_arguments(cgenv, cmd, NULL) )
+ if (!sieve_generate_arguments(cgenv, cmd, NULL))
return FALSE;
return TRUE;
@@ -129,8 +137,9 @@ static bool cmd_test_binary_generate
* Code dump
*/
-static bool cmd_test_binary_operation_dump
-(const struct sieve_dumptime_env *denv, sieve_size_t *address)
+static bool
+cmd_test_binary_operation_dump(const struct sieve_dumptime_env *denv,
+ sieve_size_t *address)
{
sieve_code_dumpf(denv, "%s:", sieve_operation_mnemonic(denv->oprtn));
@@ -143,8 +152,9 @@ static bool cmd_test_binary_operation_dump
* Intepretation
*/
-static int cmd_test_binary_operation_execute
-(const struct sieve_runtime_env *renv, sieve_size_t *address)
+static int
+cmd_test_binary_operation_execute(const struct sieve_runtime_env *renv,
+ sieve_size_t *address)
{
const struct sieve_operation *oprtn = renv->oprtn;
string_t *binary_name = NULL;
@@ -156,21 +166,24 @@ static int cmd_test_binary_operation_execute
/* Binary Name */
- if ( (ret=sieve_opr_string_read(renv, address, "binary-name", &binary_name))
- <= 0 )
+ ret = sieve_opr_string_read(renv, address, "binary-name", &binary_name);
+ if (ret <= 0 )
return ret;
/*
* Perform operation
*/
- if ( sieve_operation_is(oprtn, test_binary_load_operation) ) {
- struct sieve_binary *sbin = testsuite_binary_load(str_c(binary_name));
+ if (sieve_operation_is(oprtn, test_binary_load_operation)) {
+ struct sieve_binary *sbin =
+ testsuite_binary_load(str_c(binary_name));
- if ( sieve_runtime_trace_active(renv, SIEVE_TRLVL_COMMANDS) ) {
- sieve_runtime_trace(renv, 0, "testsuite: test_binary_load command");
+ if (sieve_runtime_trace_active(renv, SIEVE_TRLVL_COMMANDS)) {
+ sieve_runtime_trace(renv, 0, "testsuite: "
+ "test_binary_load command");
sieve_runtime_trace_descend(renv);
- sieve_runtime_trace(renv, 0, "load binary `%s'", str_c(binary_name));
+ sieve_runtime_trace(renv, 0, "load binary `%s'",
+ str_c(binary_name));
}
if ( sbin != NULL ) {
@@ -182,14 +195,15 @@ static int cmd_test_binary_operation_execute
"failed to load binary %s", str_c(binary_name));
return SIEVE_EXEC_FAILURE;
}
-
} else if ( sieve_operation_is(oprtn, test_binary_save_operation) ) {
struct sieve_binary *sbin = testsuite_script_get_binary(renv);
if ( sieve_runtime_trace_active(renv, SIEVE_TRLVL_COMMANDS) ) {
- sieve_runtime_trace(renv, 0, "testsuite: test_binary_save command");
+ sieve_runtime_trace(renv, 0, "testsuite: "
+ "test_binary_save command");
sieve_runtime_trace_descend(renv);
- sieve_runtime_trace(renv, 0, "save binary `%s'", str_c(binary_name));
+ sieve_runtime_trace(renv, 0, "save binary `%s'",
+ str_c(binary_name));
}
if ( sbin != NULL )
--
GitLab