Merged revisions 323866 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r323866 | twilson | 2011-06-15 15:03:58 -0500 (Wed, 15 Jun 2011) | 2 lines Remove now-useless cast of ARRAY_LEN ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@323867 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
b50c84be47
commit
2e97994c56
|
@ -158,7 +158,7 @@ AST_TEST_DEFINE(gettree_deltree)
|
|||
}
|
||||
|
||||
if (x != ARRAY_LEN(inputs)) {
|
||||
ast_test_status_update(test, "ast_db_gettree returned %zu entries when we expected %zu\n", x, (size_t) ARRAY_LEN(inputs));
|
||||
ast_test_status_update(test, "ast_db_gettree returned %zu entries when we expected %zu\n", x, ARRAY_LEN(inputs));
|
||||
res = AST_TEST_FAIL;
|
||||
}
|
||||
|
||||
|
@ -186,19 +186,19 @@ AST_TEST_DEFINE(gettree_deltree)
|
|||
}
|
||||
|
||||
if (x != (ARRAY_LEN(inputs) / 2)) {
|
||||
ast_test_status_update(test, "ast_db_gettree returned %zu entries when we expected %zu\n", x, (size_t) ARRAY_LEN(inputs) / 2);
|
||||
ast_test_status_update(test, "ast_db_gettree returned %zu entries when we expected %zu\n", x, ARRAY_LEN(inputs) / 2);
|
||||
res = AST_TEST_FAIL;
|
||||
}
|
||||
|
||||
ast_db_freetree(dbes);
|
||||
|
||||
if ((num_deleted = ast_db_deltree(BASE, SUB2)) != ARRAY_LEN(inputs) / 2) {
|
||||
ast_test_status_update(test, "Failed to deltree %s/%s, expected %zu deletions and got %d\n", BASE, SUB2, (size_t) ARRAY_LEN(inputs) / 2, num_deleted);
|
||||
ast_test_status_update(test, "Failed to deltree %s/%s, expected %zu deletions and got %d\n", BASE, SUB2, ARRAY_LEN(inputs) / 2, num_deleted);
|
||||
res = AST_TEST_FAIL;
|
||||
}
|
||||
|
||||
if ((num_deleted = ast_db_deltree(BASE, NULL)) != ARRAY_LEN(inputs) / 2) {
|
||||
ast_test_status_update(test, "Failed to deltree %s, expected %zu deletions and got %d\n", BASE, (size_t) ARRAY_LEN(inputs) / 2, num_deleted);
|
||||
ast_test_status_update(test, "Failed to deltree %s, expected %zu deletions and got %d\n", BASE, ARRAY_LEN(inputs) / 2, num_deleted);
|
||||
res = AST_TEST_FAIL;
|
||||
}
|
||||
|
||||
|
|
Reference in New Issue