From 9793c304facfea03912fb82c020bfeca21dc8ad0 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Wed, 30 Jun 2021 14:04:58 +0200
Subject: [PATCH] testsuite: Reformat testsuite-objects.c
---
src/testsuite/testsuite-objects.c | 214 +++++++++++++++---------------
1 file changed, 109 insertions(+), 105 deletions(-)
diff --git a/src/testsuite/testsuite-objects.c b/src/testsuite/testsuite-objects.c
index 4c09c8526..3a264753a 100644
--- a/src/testsuite/testsuite-objects.c
+++ b/src/testsuite/testsuite-objects.c
@@ -30,7 +30,8 @@ enum testsuite_object_code {
};
const struct testsuite_object_def *testsuite_core_objects[] = {
- &message_testsuite_object, &envelope_testsuite_object
+ &message_testsuite_object,
+ &envelope_testsuite_object,
};
const unsigned int testsuite_core_objects_count =
@@ -40,8 +41,8 @@ const unsigned int testsuite_core_objects_count =
* Testsuite object registry
*/
-static inline struct sieve_validator_object_registry *_get_object_registry
-(struct sieve_validator *valdtr)
+static inline struct sieve_validator_object_registry *
+_get_object_registry(struct sieve_validator *valdtr)
{
struct testsuite_validator_context *ctx =
testsuite_validator_context_get(valdtr);
@@ -49,45 +50,48 @@ static inline struct sieve_validator_object_registry *_get_object_registry
return ctx->object_registrations;
}
-void testsuite_object_register
-(struct sieve_validator *valdtr, const struct sieve_extension *ext,
- const struct testsuite_object_def *tobj_def)
+void testsuite_object_register(struct sieve_validator *valdtr,
+ const struct sieve_extension *ext,
+ const struct testsuite_object_def *tobj_def)
{
- struct sieve_validator_object_registry *regs = _get_object_registry(valdtr);
+ struct sieve_validator_object_registry *regs =
+ _get_object_registry(valdtr);
sieve_validator_object_registry_add(regs, ext, &tobj_def->obj_def);
}
-static const struct testsuite_object *testsuite_object_create
-(struct sieve_validator *valdtr, struct sieve_command *cmd,
- const char *identifier)
+static const struct testsuite_object *
+testsuite_object_create(struct sieve_validator *valdtr,
+ struct sieve_command *cmd, const char *identifier)
{
- struct sieve_validator_object_registry *regs = _get_object_registry(valdtr);
+ struct sieve_validator_object_registry *regs =
+ _get_object_registry(valdtr);
struct sieve_object object;
struct testsuite_object *tobj;
- if ( !sieve_validator_object_registry_find(regs, identifier, &object) )
+ if (!sieve_validator_object_registry_find(regs, identifier, &object))
return NULL;
tobj = p_new(sieve_command_pool(cmd), struct testsuite_object, 1);
tobj->object = object;
- tobj->def = (const struct testsuite_object_def *) object.def;
+ tobj->def = (const struct testsuite_object_def *)object.def;
- return tobj;
+ return tobj;
}
-void testsuite_register_core_objects
-(struct testsuite_validator_context *ctx)
+void testsuite_register_core_objects(struct testsuite_validator_context *ctx)
{
- struct sieve_validator_object_registry *regs = ctx->object_registrations;
+ struct sieve_validator_object_registry *regs =
+ ctx->object_registrations;
unsigned int i;
/* Register core testsuite objects */
- for ( i = 0; i < testsuite_core_objects_count; i++ ) {
- const struct testsuite_object_def *tobj_def = testsuite_core_objects[i];
+ for (i = 0; i < testsuite_core_objects_count; i++) {
+ const struct testsuite_object_def *tobj_def =
+ testsuite_core_objects[i];
- sieve_validator_object_registry_add
- (regs, testsuite_ext, &tobj_def->obj_def);
+ sieve_validator_object_registry_add(
+ regs, testsuite_ext, &tobj_def->obj_def);
}
}
@@ -106,89 +110,88 @@ const struct sieve_operand_def testsuite_object_operand = {
.ext_def = &testsuite_extension,
.code = TESTSUITE_OPERAND_OBJECT,
.class = &sieve_testsuite_object_operand_class,
- .interface = &core_testsuite_objects
+ .interface = &core_testsuite_objects,
};
-static void testsuite_object_emit
-(struct sieve_binary_block *sblock, const struct testsuite_object *tobj,
- int member_id)
+static void
+testsuite_object_emit(struct sieve_binary_block *sblock,
+ const struct testsuite_object *tobj, int member_id)
{
sieve_opr_object_emit(sblock, tobj->object.ext, tobj->object.def);
- if ( tobj->def != NULL && tobj->def->get_member_id != NULL ) {
- (void) sieve_binary_emit_byte(sblock, (unsigned char) member_id);
- }
+ if (tobj->def != NULL && tobj->def->get_member_id != NULL)
+ (void)sieve_binary_emit_byte(sblock, (unsigned char)member_id);
}
-bool testsuite_object_read
-(struct sieve_binary_block *sblock, sieve_size_t *address,
- struct testsuite_object *tobj)
+bool testsuite_object_read(struct sieve_binary_block *sblock,
+ sieve_size_t *address, struct testsuite_object *tobj)
{
struct sieve_operand oprnd;
- if ( !sieve_operand_read(sblock, address, NULL, &oprnd) )
+ if (!sieve_operand_read(sblock, address, NULL, &oprnd))
return FALSE;
- if ( !sieve_opr_object_read_data
- (sblock, &oprnd, &sieve_testsuite_object_operand_class, address,
- &tobj->object) )
+ if (!sieve_opr_object_read_data(sblock, &oprnd,
+ &sieve_testsuite_object_operand_class,
+ address, &tobj->object))
return FALSE;
- tobj->def = (const struct testsuite_object_def *) tobj->object.def;
+ tobj->def = (const struct testsuite_object_def *)tobj->object.def;
i_assert(tobj->def != NULL);
return TRUE;
}
-bool testsuite_object_read_member
-(struct sieve_binary_block *sblock, sieve_size_t *address,
- struct testsuite_object *tobj, int *member_id_r)
+bool testsuite_object_read_member(struct sieve_binary_block *sblock,
+ sieve_size_t *address,
+ struct testsuite_object *tobj,
+ int *member_id_r)
{
- if ( !testsuite_object_read(sblock, address, tobj) )
+ if (!testsuite_object_read(sblock, address, tobj))
return FALSE;
*member_id_r = -1;
- if ( tobj->def->get_member_id != NULL ) {
- if ( !sieve_binary_read_code(sblock, address, member_id_r) )
+ if (tobj->def->get_member_id != NULL) {
+ if (!sieve_binary_read_code(sblock, address, member_id_r))
return FALSE;
}
-
return TRUE;
}
-const char *testsuite_object_member_name
-(const struct testsuite_object *object, int member_id)
+const char *
+testsuite_object_member_name(const struct testsuite_object *object,
+ int member_id)
{
const struct testsuite_object_def *obj_def = object->def;
const char *member = NULL;
- if ( obj_def->get_member_id != NULL ) {
- if ( obj_def->get_member_name != NULL )
+ if (obj_def->get_member_id != NULL) {
+ if (obj_def->get_member_name != NULL)
member = obj_def->get_member_name(member_id);
} else
return obj_def->obj_def.identifier;
- if ( member == NULL )
- return t_strdup_printf("%s.%d", obj_def->obj_def.identifier, member_id);
-
+ if (member == NULL) {
+ return t_strdup_printf("%s.%d", obj_def->obj_def.identifier,
+ member_id);
+ }
return t_strdup_printf("%s.%s", obj_def->obj_def.identifier, member);
}
-bool testsuite_object_dump
-(const struct sieve_dumptime_env *denv, sieve_size_t *address)
+bool testsuite_object_dump(const struct sieve_dumptime_env *denv,
+ sieve_size_t *address)
{
struct testsuite_object object;
int member_id;
sieve_code_mark(denv);
- if ( !testsuite_object_read_member
- (denv->sblock, address, &object, &member_id) )
+ if (!testsuite_object_read_member(denv->sblock, address,
+ &object, &member_id))
return FALSE;
sieve_code_dumpf(denv, "%s: %s",
- sieve_testsuite_object_operand_class.name,
- testsuite_object_member_name(&object, member_id));
-
+ sieve_testsuite_object_operand_class.name,
+ testsuite_object_member_name(&object, member_id));
return TRUE;
}
@@ -196,9 +199,10 @@ bool testsuite_object_dump
* Testsuite object argument
*/
-static bool arg_testsuite_object_generate
- (const struct sieve_codegen_env *cgenv, struct sieve_ast_argument *arg,
- struct sieve_command *cmd);
+static bool
+arg_testsuite_object_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_ast_argument *arg,
+ struct sieve_command *cmd);
const struct sieve_argument_def testsuite_object_argument = {
.identifier = "testsuite-object",
@@ -210,9 +214,9 @@ struct testsuite_object_argctx {
int member;
};
-bool testsuite_object_argument_activate
-(struct sieve_validator *valdtr, struct sieve_ast_argument *arg,
- struct sieve_command *cmd)
+bool testsuite_object_argument_activate(struct sieve_validator *valdtr,
+ struct sieve_ast_argument *arg,
+ struct sieve_command *cmd)
{
const char *objname = sieve_ast_argument_strc(arg);
const struct testsuite_object *tobj;
@@ -223,7 +227,7 @@ bool testsuite_object_argument_activate
/* Parse the object specifier */
member = strchr(objname, '.');
- if ( member != NULL ) {
+ if (member != NULL) {
objname = t_strdup_until(objname, member);
member++;
}
@@ -231,20 +235,22 @@ bool testsuite_object_argument_activate
/* Find the object */
tobj = testsuite_object_create(valdtr, cmd, objname);
- if ( tobj == NULL ) {
+ if (tobj == NULL) {
sieve_argument_validate_error(valdtr, arg,
- "unknown testsuite object '%s'", objname);
+ "unknown testsuite object '%s'",
+ objname);
return FALSE;
}
/* Find the object member */
member_id = -1;
- if ( member != NULL ) {
- if ( tobj->def == NULL || tobj->def->get_member_id == NULL ||
- (member_id=tobj->def->get_member_id(member)) == -1 ) {
+ if (member != NULL) {
+ if (tobj->def == NULL || tobj->def->get_member_id == NULL ||
+ (member_id = tobj->def->get_member_id(member)) == -1) {
sieve_argument_validate_error(valdtr, arg,
- "member '%s' does not exist for testsuite object '%s'", member, objname);
+ "member '%s' does not exist for testsuite object '%s'",
+ member, objname);
return FALSE;
}
}
@@ -255,22 +261,21 @@ bool testsuite_object_argument_activate
ctx->object = tobj;
ctx->member = member_id;
- arg->argument = sieve_argument_create
- (arg->ast, &testsuite_object_argument, testsuite_ext, 0);
- arg->argument->data = (void *) ctx;
-
+ arg->argument = sieve_argument_create(
+ arg->ast, &testsuite_object_argument, testsuite_ext, 0);
+ arg->argument->data = (void *)ctx;
return TRUE;
}
-static bool arg_testsuite_object_generate
- (const struct sieve_codegen_env *cgenv, struct sieve_ast_argument *arg,
- struct sieve_command *cmd ATTR_UNUSED)
+static bool
+arg_testsuite_object_generate(const struct sieve_codegen_env *cgenv,
+ struct sieve_ast_argument *arg,
+ struct sieve_command *cmd ATTR_UNUSED)
{
struct testsuite_object_argctx *ctx =
- (struct testsuite_object_argctx *) arg->argument->data;
+ (struct testsuite_object_argctx *)arg->argument->data;
testsuite_object_emit(cgenv->sblock, ctx->object, ctx->member);
-
return TRUE;
}
@@ -278,62 +283,62 @@ static bool arg_testsuite_object_generate
* Testsuite core object implementation
*/
-static bool tsto_message_set_member
- (const struct sieve_runtime_env *renv, int id, string_t *value);
+static bool tsto_message_set_member(const struct sieve_runtime_env *renv,
+ int id, string_t *value);
static int tsto_envelope_get_member_id(const char *identifier);
static const char *tsto_envelope_get_member_name(int id);
-static bool tsto_envelope_set_member
- (const struct sieve_runtime_env *renv, int id, string_t *value);
+static bool tsto_envelope_set_member(const struct sieve_runtime_env *renv,
+ int id, string_t *value);
const struct testsuite_object_def message_testsuite_object = {
- SIEVE_OBJECT("message",
- &testsuite_object_operand, TESTSUITE_OBJECT_MESSAGE),
- .set_member = tsto_message_set_member
+ SIEVE_OBJECT("message", &testsuite_object_operand,
+ TESTSUITE_OBJECT_MESSAGE),
+ .set_member = tsto_message_set_member,
};
const struct testsuite_object_def envelope_testsuite_object = {
- SIEVE_OBJECT("envelope",
- &testsuite_object_operand, TESTSUITE_OBJECT_ENVELOPE),
+ SIEVE_OBJECT("envelope", &testsuite_object_operand,
+ TESTSUITE_OBJECT_ENVELOPE),
.get_member_id = tsto_envelope_get_member_id,
.get_member_name = tsto_envelope_get_member_name,
- .set_member = tsto_envelope_set_member
+ .set_member = tsto_envelope_set_member,
};
enum testsuite_object_envelope_field {
TESTSUITE_OBJECT_ENVELOPE_FROM,
TESTSUITE_OBJECT_ENVELOPE_TO,
TESTSUITE_OBJECT_ENVELOPE_ORIG_TO,
- TESTSUITE_OBJECT_ENVELOPE_AUTH_USER
+ TESTSUITE_OBJECT_ENVELOPE_AUTH_USER,
};
-static bool tsto_message_set_member
-(const struct sieve_runtime_env *renv, int id, string_t *value)
+static bool
+tsto_message_set_member(const struct sieve_runtime_env *renv, int id,
+ string_t *value)
{
- if ( id != -1 ) return FALSE;
+ if (id != -1)
+ return FALSE;
testsuite_message_set_string(renv, value);
-
return TRUE;
}
static int tsto_envelope_get_member_id(const char *identifier)
{
- if ( strcasecmp(identifier, "from") == 0 )
+ if (strcasecmp(identifier, "from") == 0)
return TESTSUITE_OBJECT_ENVELOPE_FROM;
- if ( strcasecmp(identifier, "to") == 0 )
+ if (strcasecmp(identifier, "to") == 0)
return TESTSUITE_OBJECT_ENVELOPE_TO;
- if ( strcasecmp(identifier, "orig_to") == 0 )
+ if (strcasecmp(identifier, "orig_to") == 0)
return TESTSUITE_OBJECT_ENVELOPE_ORIG_TO;
- if ( strcasecmp(identifier, "auth") == 0 )
+ if (strcasecmp(identifier, "auth") == 0)
return TESTSUITE_OBJECT_ENVELOPE_AUTH_USER;
-
return -1;
}
static const char *tsto_envelope_get_member_name(int id)
{
- switch ( id ) {
+ switch (id) {
case TESTSUITE_OBJECT_ENVELOPE_FROM:
return "from";
case TESTSUITE_OBJECT_ENVELOPE_TO:
@@ -343,14 +348,14 @@ static const char *tsto_envelope_get_member_name(int id)
case TESTSUITE_OBJECT_ENVELOPE_AUTH_USER:
return "auth";
}
-
return NULL;
}
-static bool tsto_envelope_set_member
-(const struct sieve_runtime_env *renv, int id, string_t *value)
+static bool
+tsto_envelope_set_member(const struct sieve_runtime_env *renv, int id,
+ string_t *value)
{
- switch ( id ) {
+ switch (id) {
case TESTSUITE_OBJECT_ENVELOPE_FROM:
testsuite_envelope_set_sender(renv, str_c(value));
return TRUE;
@@ -364,6 +369,5 @@ static bool tsto_envelope_set_member
testsuite_envelope_set_auth_user(renv, str_c(value));
return TRUE;
}
-
return FALSE;
}
--
GitLab