loci: convert locitest away from inheritance union
diff --git a/c_gen/templates/locitest/test_utils.c b/c_gen/templates/locitest/test_utils.c
index 10a6b3d..d078a59 100644
--- a/c_gen/templates/locitest/test_utils.c
+++ b/c_gen/templates/locitest/test_utils.c
@@ -43,12 +43,8 @@
test_has_outport(void)
{
of_list_action_t *list;
- of_action_t elt;
- of_action_set_dl_src_t *set_dl_src;
- of_action_output_t *output;
-
- set_dl_src = &elt.set_dl_src;
- output = &elt.output;
+ of_object_t set_dl_src;
+ of_object_t output;
list = of_list_action_new(OF_VERSION_1_0);
TEST_ASSERT(list != NULL);
@@ -57,25 +53,25 @@
TEST_ASSERT(!of_action_list_has_out_port(list, 1));
/* Add some other action */
- of_action_set_dl_src_init(set_dl_src, OF_VERSION_1_0, -1, 1);
- TEST_OK(of_list_action_append_bind(list, (of_action_t *)set_dl_src));
+ of_action_set_dl_src_init(&set_dl_src, OF_VERSION_1_0, -1, 1);
+ TEST_OK(of_list_action_append_bind(list, &set_dl_src));
TEST_ASSERT(of_action_list_has_out_port(list, OF_PORT_DEST_WILDCARD));
TEST_ASSERT(!of_action_list_has_out_port(list, 1));
/* Add port 2 */
- of_action_output_init(output, OF_VERSION_1_0, -1, 1);
- TEST_OK(of_list_action_append_bind(list, (of_action_t *)output));
- of_action_output_port_set(output, 2);
+ of_action_output_init(&output, OF_VERSION_1_0, -1, 1);
+ TEST_OK(of_list_action_append_bind(list, &output));
+ of_action_output_port_set(&output, 2);
TEST_ASSERT(of_action_list_has_out_port(list, OF_PORT_DEST_WILDCARD));
TEST_ASSERT(!of_action_list_has_out_port(list, 1));
TEST_ASSERT(of_action_list_has_out_port(list, 2));
/* Add port 1 */
- of_action_output_init(output, OF_VERSION_1_0, -1, 1);
- TEST_OK(of_list_action_append_bind(list, (of_action_t *)output));
- of_action_output_port_set(output, 1);
+ of_action_output_init(&output, OF_VERSION_1_0, -1, 1);
+ TEST_OK(of_list_action_append_bind(list, &output));
+ of_action_output_port_set(&output, 1);
TEST_ASSERT(of_action_list_has_out_port(list, OF_PORT_DEST_WILDCARD));
TEST_ASSERT(of_action_list_has_out_port(list, 1));
@@ -88,26 +84,26 @@
TEST_ASSERT(list != NULL);
/* Add port 2 */
- of_action_output_init(output, OF_VERSION_1_0, -1, 1);
- TEST_OK(of_list_action_append_bind(list, (of_action_t *)output));
- of_action_output_port_set(output, 2);
+ of_action_output_init(&output, OF_VERSION_1_0, -1, 1);
+ TEST_OK(of_list_action_append_bind(list, &output));
+ of_action_output_port_set(&output, 2);
TEST_ASSERT(of_action_list_has_out_port(list, OF_PORT_DEST_WILDCARD));
TEST_ASSERT(!of_action_list_has_out_port(list, 1));
TEST_ASSERT(of_action_list_has_out_port(list, 2));
/* Add some other action */
- of_action_set_dl_src_init(set_dl_src, OF_VERSION_1_0, -1, 1);
- TEST_OK(of_list_action_append_bind(list, (of_action_t *)set_dl_src));
+ of_action_set_dl_src_init(&set_dl_src, OF_VERSION_1_0, -1, 1);
+ TEST_OK(of_list_action_append_bind(list, &set_dl_src));
TEST_ASSERT(of_action_list_has_out_port(list, OF_PORT_DEST_WILDCARD));
TEST_ASSERT(!of_action_list_has_out_port(list, 1));
TEST_ASSERT(of_action_list_has_out_port(list, 2));
/* Add port 1 */
- of_action_output_init(output, OF_VERSION_1_0, -1, 1);
- TEST_OK(of_list_action_append_bind(list, (of_action_t *)output));
- of_action_output_port_set(output, 1);
+ of_action_output_init(&output, OF_VERSION_1_0, -1, 1);
+ TEST_OK(of_list_action_append_bind(list, &output));
+ of_action_output_port_set(&output, 1);
TEST_ASSERT(of_action_list_has_out_port(list, OF_PORT_DEST_WILDCARD));
TEST_ASSERT(of_action_list_has_out_port(list, 1));
diff --git a/c_gen/templates/locitest/test_validator.c b/c_gen/templates/locitest/test_validator.c
index a4b55eb..fde5cba 100644
--- a/c_gen/templates/locitest/test_validator.c
+++ b/c_gen/templates/locitest/test_validator.c
@@ -88,9 +88,9 @@
of_message_t msg;
of_flow_modify_actions_bind(obj, &list);
of_action_set_tp_dst_init(&element1, OF_VERSION_1_0, -1, 1);
- of_list_action_append_bind(&list, (of_action_t *)&element1);
+ of_list_action_append_bind(&list, &element1);
of_action_output_init(&element2, OF_VERSION_1_0, -1, 1);
- of_list_action_append_bind(&list, (of_action_t *)&element2);
+ of_list_action_append_bind(&list, &element2);
msg = OF_OBJECT_TO_MESSAGE(obj);
TEST_ASSERT(of_validate_message(msg, of_message_length_get(msg)) == 0);