kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 22:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

stringfields: Update extended string fields for master only.

Browse Source 
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
This commit is contained in:
George Joseph
2016-04-13 12:38:01 -06:00
parent fddec0c266
commit caa416d5f3
3 changed files with 28 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/test_stringfields.c
View File

@@ -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;