[svn-commits] mjordan: branch 12 r420097 - /branches/12/tests/test_message.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Tue Aug  5 16:36:25 2014
New Revision: 420097

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420097
Log:
test_message: Fix strict-aliasing compilation issue

Modified:
    branches/12/tests/test_message.c

Modified: branches/12/tests/test_message.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/tests/test_message.c?view=diff&rev=420097&r1=420096&r2=420097
==============================================================================
--- branches/12/tests/test_message.c (original)
+++ branches/12/tests/test_message.c Tue Aug  5 16:36:25 2014
@@ -788,31 +788,27 @@
 	return 0;
 }
 
-static void free_variable_vector(struct var_vector *vector)
-{
-	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);
-}
+#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)
+
 
 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)
 {