ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

4654. [cleanup] Don't use C++ keywords delete, new and namespace.

Browse Source 
[RT #45538]
This commit is contained in:
Mark Andrews
2017-07-21 11:52:24 +10:00
parent 0297ebcc89
commit 4bf32aa587
36 changed files with 586 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/dns/tests/dbdiff_test.c
View File

@@ -33,14 +33,14 @@
#define TEST_ORIGIN "test"
static void
test_create(const atf_tc_t *tc, dns_db_t **old, dns_db_t **new) {
test_create(const atf_tc_t *tc, dns_db_t **old, dns_db_t **newdb) {
isc_result_t result;
result = dns_test_loaddb(old, dns_dbtype_zone, TEST_ORIGIN,
atf_tc_get_md_var(tc, "X-old"));
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = dns_test_loaddb(new, dns_dbtype_zone, TEST_ORIGIN,
result = dns_test_loaddb(newdb, dns_dbtype_zone, TEST_ORIGIN,
atf_tc_get_md_var(tc, "X-new"));
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
}
@@ -55,25 +55,25 @@ ATF_TC_HEAD(diffx_same, tc) {
atf_tc_set_md_var(tc, "X-old", "testdata/diff/zone1.data");
atf_tc_set_md_var(tc, "X-new", "testdata/diff/zone1.data"); }
ATF_TC_BODY(diffx_same, tc) {
dns_db_t *new = NULL, *old = NULL;
dns_db_t *newdb = NULL, *olddb = NULL;
isc_result_t result;
dns_diff_t diff;
result = dns_test_begin(NULL, ISC_FALSE);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
test_create(tc, &old, &new);
test_create(tc, &olddb, &newdb);
dns_diff_init(mctx, &diff);
result = dns_db_diffx(&diff, new, NULL, old, NULL, NULL);
result = dns_db_diffx(&diff, newdb, NULL, olddb, NULL, NULL);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
ATF_REQUIRE_EQ(ISC_LIST_EMPTY(diff.tuples), ISC_TRUE);
dns_diff_clear(&diff);
dns_db_detach(&new);
dns_db_detach(&old);
dns_db_detach(&newdb);
dns_db_detach(&olddb);
dns_test_end();
}
@@ -85,7 +85,7 @@ ATF_TC_HEAD(diffx_add, tc) {
atf_tc_set_md_var(tc, "X-new", "testdata/diff/zone2.data");
}
ATF_TC_BODY(diffx_add, tc) {
dns_db_t *new = NULL, *old = NULL;
dns_db_t *newdb = NULL, *olddb = NULL;
dns_difftuple_t *tuple;
isc_result_t result;
dns_diff_t diff;
@@ -94,11 +94,11 @@ ATF_TC_BODY(diffx_add, tc) {
result = dns_test_begin(NULL, ISC_FALSE);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
test_create(tc, &old, &new);
test_create(tc, &olddb, &newdb);
dns_diff_init(mctx, &diff);
result = dns_db_diffx(&diff, new, NULL, old, NULL, NULL);
result = dns_db_diffx(&diff, newdb, NULL, olddb, NULL, NULL);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
ATF_REQUIRE_EQ(ISC_LIST_EMPTY(diff.tuples), ISC_FALSE);
@@ -110,8 +110,8 @@ ATF_TC_BODY(diffx_add, tc) {
ATF_REQUIRE_EQ(count, 1);
dns_diff_clear(&diff);
dns_db_detach(&new);
dns_db_detach(&old);
dns_db_detach(&newdb);
dns_db_detach(&olddb);
dns_test_end();
}
@@ -123,7 +123,7 @@ ATF_TC_HEAD(diffx_remove, tc) {
atf_tc_set_md_var(tc, "X-new", "testdata/diff/zone3.data");
}
ATF_TC_BODY(diffx_remove, tc) {
dns_db_t *new = NULL, *old = NULL;
dns_db_t *newdb = NULL, *olddb = NULL;
dns_difftuple_t *tuple;
isc_result_t result;
dns_diff_t diff;
@@ -132,11 +132,11 @@ ATF_TC_BODY(diffx_remove, tc) {
result = dns_test_begin(NULL, ISC_FALSE);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
test_create(tc, &old, &new);
test_create(tc, &olddb, &newdb);
dns_diff_init(mctx, &diff);
result = dns_db_diffx(&diff, new, NULL, old, NULL, NULL);
result = dns_db_diffx(&diff, newdb, NULL, olddb, NULL, NULL);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
ATF_REQUIRE_EQ(ISC_LIST_EMPTY(diff.tuples), ISC_FALSE);
@@ -148,8 +148,8 @@ ATF_TC_BODY(diffx_remove, tc) {
ATF_REQUIRE_EQ(count, 1);
dns_diff_clear(&diff);
dns_db_detach(&new);
dns_db_detach(&old);
dns_db_detach(&newdb);
dns_db_detach(&olddb);
dns_test_end();
}