test_message: Fix strict-aliasing compilation issue

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@420097 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/tests/test_message.c b/tests/test_message.c
index 391b01a88fc378b95a844c1e62e82bbd0b4484b5..13e24a842831ef44171c7b2257897e72224cf414 100644 (file)
--- a/tests/test_message.c
+++ b/tests/test_message.c
@@ -788,32 +788,28 @@ static int test_init_cb(struct ast_test_info *info, struct ast_test *test)
        return 0;
 }
 
-static void free_variable_vector(struct var_vector *vector)
-{
-       int i;
+#define FREE_VARIABLE_VECTOR(vector) do { \
+       int i; \
+       for (i = 0; i < AST_VECTOR_SIZE(&(vector)); i++) { \
+               struct ast_variable *headers; \
+               headers = AST_VECTOR_GET(&(vector), i); \
+               if (!headers) { \
+                       continue; \
+               } \
+               ast_variables_destroy(headers); \
+       } \
+       AST_VECTOR_FREE(&(vector)); \
+       } while (0)
 
-       for (i = 0; i < AST_VECTOR_SIZE(vector); i++) {
-               struct ast_variable *headers;
-
-               headers = AST_VECTOR_GET(vector, i);
-               if (!headers) {
-                       continue;
-               }
-               ast_variables_destroy(headers);
-       }
-
-       AST_VECTOR_FREE(vector);
-}
 
 static int test_cleanup_cb(struct ast_test_info *info, struct ast_test *test)
 {
-       free_variable_vector((struct var_vector *)&expected_user_event_fields);
-       free_variable_vector((struct var_vector *)&bad_headers);
+       FREE_VARIABLE_VECTOR(expected_user_event_fields);
+       FREE_VARIABLE_VECTOR(bad_headers);
 
        return 0;
 }
 
-
 static int unload_module(void)
 {
        AST_TEST_UNREGISTER(test_message_msg_tech_registration);