diff options
| author | George Joseph <george.joseph@fairview5.com> | 2016-04-13 12:38:01 -0600 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2016-04-13 14:01:37 -0600 |
| commit | caa416d5f305526c1ef7ed9065ab5361d87ebba1 (patch) | |
| tree | f47a773afe7f437bd6650dd23f88a6fc10e279c8 /tests | |
| parent | fddec0c2664a65b5ffa18894af60bf4d81a7dafc (diff) | |
stringfields: Update extended string fields for master only.
In 13, the new ast_string_field_header structure had to be dynamically
allocated and assigned to a pointer in ast_string_field_mgr to preserve ABI
compatability. In master, it can be converted to being a structure-in-place in
ast_string_field_mgr to eliminate the extra alloc and free calls.
Change-Id: Ia97c5345eec68717a15dc16fe2e6746ff2a926f4
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_stringfields.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_stringfields.c b/tests/test_stringfields.c index e57f8d7e8..706b07d8e 100644 --- a/tests/test_stringfields.c +++ b/tests/test_stringfields.c @@ -369,7 +369,7 @@ AST_TEST_DEFINE(string_field_aggregate_test) ast_string_field_ptr_set_by_fields(inst2->__field_mgr_pool, inst2->__field_mgr, &inst2->string1, "foo"); inst2->foo = 2; - if (inst3->__field_mgr.header->embedded_pool->prev) { + if (inst3->__field_mgr.embedded_pool->prev) { ast_test_status_update(test, "Structure 3 embedded pool should not have a previous pool!\n"); res = AST_TEST_FAIL; goto error; @@ -377,13 +377,13 @@ AST_TEST_DEFINE(string_field_aggregate_test) ast_string_field_set(inst3, string1, "foo"); - if (inst3->__field_mgr.header->embedded_pool != inst3->__field_mgr_pool) { + if (inst3->__field_mgr.embedded_pool != inst3->__field_mgr_pool) { ast_test_status_update(test, "Structure 3 embedded pool should have been the current pool!\n"); res = AST_TEST_FAIL; goto error; } - if (inst3->__field_mgr.header->embedded_pool->prev) { + if (inst3->__field_mgr.embedded_pool->prev) { ast_test_status_update(test, "Structure 3 embedded pool should not have a previous pool!\n"); res = AST_TEST_FAIL; goto error; @@ -395,13 +395,13 @@ AST_TEST_DEFINE(string_field_aggregate_test) ast_string_field_set(inst3, string2, "baz 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890"); inst3->foo = 3; - if (inst3->__field_mgr_pool == inst3->__field_mgr.header->embedded_pool) { + if (inst3->__field_mgr_pool == inst3->__field_mgr.embedded_pool) { ast_test_status_update(test, "Structure 3 embedded pool should not have been the current pool!\n"); res = AST_TEST_FAIL; goto error; } - if (inst3->__field_mgr.header->embedded_pool != inst3->__field_mgr_pool->prev) { + if (inst3->__field_mgr.embedded_pool != inst3->__field_mgr_pool->prev) { ast_test_status_update(test, "Structure 3 embedded pool should be the current pool's previous!\n"); res = AST_TEST_FAIL; goto error; @@ -484,7 +484,7 @@ AST_TEST_DEFINE(string_field_aggregate_test) ast_test_status_update(test, "Structures 1/2 are the same (empty) as expected.\n"); } - if (inst4->__field_mgr.header->embedded_pool != inst4->__field_mgr_pool) { + if (inst4->__field_mgr.embedded_pool != inst4->__field_mgr_pool) { ast_test_status_update(test, "Structure 4 embedded pool should have been the current pool!\n"); res = AST_TEST_FAIL; goto error; @@ -492,7 +492,7 @@ AST_TEST_DEFINE(string_field_aggregate_test) ast_test_status_update(test, "Structure 4 embedded pool is the current pool as expected.\n"); } - if (inst4->__field_mgr.header->embedded_pool->prev) { + if (inst4->__field_mgr.embedded_pool->prev) { ast_test_status_update(test, "Structure 4 embedded pool should not have a previous pool!\n"); res = AST_TEST_FAIL; goto error; |