From: Alessio Podda Date: Fri, 5 Dec 2025 15:14:41 +0000 (+0100) Subject: Fix formatting X-Git-Tag: v9.21.17~47^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad0a38209292b04db8bc6202af4cdcbe6e5a8e4a;p=thirdparty%2Fbind9.git Fix formatting Cleanup formatting after IXFR changes. --- diff --git a/lib/dns/db.c b/lib/dns/db.c index 36416e402a9..aa305d542c9 100644 --- a/lib/dns/db.c +++ b/lib/dns/db.c @@ -301,7 +301,8 @@ dns_db_endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks) { } isc_result_t -dns_db_beginupdate(dns_db_t *db, dns_dbversion_t *ver, dns_rdatacallbacks_t *callbacks) { +dns_db_beginupdate(dns_db_t *db, dns_dbversion_t *ver, + dns_rdatacallbacks_t *callbacks) { /* * Begin updating 'db'. */ diff --git a/lib/dns/diff.c b/lib/dns/diff.c index f89d245a677..43fc7ca946b 100644 --- a/lib/dns/diff.c +++ b/lib/dns/diff.c @@ -238,7 +238,7 @@ update_rdataset(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, options = DNS_DBADD_MERGE | DNS_DBADD_EXACT | DNS_DBADD_EXACTTTL; CHECK(dns_db_addrdataset(db, node, ver, 0, rds, options, - &ardataset)); + &ardataset)); break; case DNS_DIFFOP_DEL: case DNS_DIFFOP_DELRESIGN: diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h index 92b81496014..069f788cd84 100644 --- a/lib/dns/include/dns/db.h +++ b/lib/dns/include/dns/db.h @@ -89,12 +89,11 @@ typedef struct dns_db_methods { isc_result_t (*beginload)(dns_db_t *db, dns_rdatacallbacks_t *callbacks); isc_result_t (*endload)(dns_db_t *db, dns_rdatacallbacks_t *callbacks); - isc_result_t (*beginupdate)(dns_db_t *db, - dns_dbversion_t *ver, + isc_result_t (*beginupdate)(dns_db_t *db, dns_dbversion_t *ver, dns_rdatacallbacks_t *callbacks); - isc_result_t (*commitupdate)(dns_db_t *db, + isc_result_t (*commitupdate)(dns_db_t *db, dns_rdatacallbacks_t *callbacks); - isc_result_t (*abortupdate)(dns_db_t *db, + isc_result_t (*abortupdate)(dns_db_t *db, dns_rdatacallbacks_t *callbacks); void (*currentversion)(dns_db_t *db, dns_dbversion_t **versionp); isc_result_t (*newversion)(dns_db_t *db, dns_dbversion_t **versionp); @@ -538,7 +537,8 @@ dns_db_endload(dns_db_t *db, dns_rdatacallbacks_t *callbacks); */ isc_result_t -dns_db_beginupdate(dns_db_t *db, dns_dbversion_t *ver, dns_rdatacallbacks_t *callbacks); +dns_db_beginupdate(dns_db_t *db, dns_dbversion_t *ver, + dns_rdatacallbacks_t *callbacks); /*%< * Begin updating 'db'. * @@ -567,7 +567,7 @@ dns_db_beginupdate(dns_db_t *db, dns_dbversion_t *ver, dns_rdatacallbacks_t *cal isc_result_t dns_db_commitupdate(dns_db_t *db, dns_rdatacallbacks_t *callbacks); /*%< - * Commit the update to 'db'. Must be safe to double-call or call after + * Commit the update to 'db'. Must be safe to double-call or call after * dns_db_abortupdate. * * Requires: @@ -576,11 +576,13 @@ dns_db_commitupdate(dns_db_t *db, dns_rdatacallbacks_t *callbacks); * * \li 'callbacks' is a valid dns_rdatacallbacks_t structure. * - * \li callbacks->add_private is not NULL and is a valid database update context. + * \li callbacks->add_private is not NULL and is a valid database update + * context. * * Ensures: * - * \li 'callbacks' is returned to its state prior to calling dns_db_beginupdate() + * \li 'callbacks' is returned to its state prior to calling + * dns_db_beginupdate() * * Returns: * @@ -593,7 +595,7 @@ dns_db_commitupdate(dns_db_t *db, dns_rdatacallbacks_t *callbacks); isc_result_t dns_db_abortupdate(dns_db_t *db, dns_rdatacallbacks_t *callbacks); /*%< - * Abort the update to 'db'. Must be safe to double-call or call after + * Abort the update to 'db'. Must be safe to double-call or call after * dns_db_commitupdate. * * Requires: @@ -602,11 +604,13 @@ dns_db_abortupdate(dns_db_t *db, dns_rdatacallbacks_t *callbacks); * * \li 'callbacks' is a valid dns_rdatacallbacks_t structure. * - * \li callbacks->add_private is not NULL and is a valid database update context. + * \li callbacks->add_private is not NULL and is a valid database update + * context. * * Ensures: * - * \li 'callbacks' is returned to its state prior to calling dns_db_beginupdate() + * \li 'callbacks' is returned to its state prior to calling + * dns_db_beginupdate() * * Returns: * diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h index e2073f80bf7..32e81890de4 100644 --- a/lib/dns/include/dns/diff.h +++ b/lib/dns/include/dns/diff.h @@ -59,7 +59,6 @@ * timeexpire. */ - typedef struct dns_difftuple dns_difftuple_t; typedef ISC_LIST(dns_difftuple_t) dns_difftuplelist_t; @@ -253,13 +252,14 @@ dns_diff_applysilently(const dns_diff_t *diff, dns_db_t *db, */ typedef struct { - dns_db_t *db; + dns_db_t *db; dns_dbversion_t *ver; - bool warn; + bool warn; } dns_updatectx_t; isc_result_t -dns_diff_apply_with_callbacks(const dns_diff_t *diff, dns_rdatacallbacks_t *callbacks); +dns_diff_apply_with_callbacks(const dns_diff_t *diff, + dns_rdatacallbacks_t *callbacks); /*%< * Apply 'diff' to the database using the provided callbacks and context. * The context contains the database, version, and warning flag. diff --git a/lib/dns/master.c b/lib/dns/master.c index 191b91fc281..ce2dca13d47 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -2858,7 +2858,8 @@ commit(dns_rdatacallbacks_t *callbacks, dns_loadctx_t *lctx, dataset.resign = resign_fromlist(this, lctx); } result = callbacks->update(callbacks->add_private, owner, - &dataset, DNS_DIFFOP_ADD DNS__DB_FILELINE); + &dataset, + DNS_DIFFOP_ADD DNS__DB_FILELINE); if (result != ISC_R_SUCCESS) { dns_name_format(owner, namebuf, sizeof(namebuf)); if (source != NULL) { diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c index ae3f4a43ce6..1244426124d 100644 --- a/lib/dns/qpzone.c +++ b/lib/dns/qpzone.c @@ -2073,8 +2073,8 @@ addwildcards(qpzonedb_t *qpdb, dns_qp_t *qp, const dns_name_t *name, } static isc_result_t -loading_addrdataset(void *arg, const dns_name_t *name, - dns_rdataset_t *rdataset, dns_diffop_t op ISC_ATTR_UNUSED DNS__DB_FLARG) { +loading_addrdataset(void *arg, const dns_name_t *name, dns_rdataset_t *rdataset, + dns_diffop_t op ISC_ATTR_UNUSED DNS__DB_FLARG) { qpz_load_t *loadctx = arg; qpzonedb_t *qpdb = (qpzonedb_t *)loadctx->db; qpznode_t *node = NULL; @@ -2440,7 +2440,7 @@ setgluecachestats(dns_db_t *db, isc_stats_t *stats) { return ISC_R_SUCCESS; } -static dns_qp_t* +static dns_qp_t * begin_transaction(qpzonedb_t *qpdb, dns_qpread_t *qprp, bool create) { dns_qp_t *qp = NULL; @@ -2460,14 +2460,14 @@ end_transaction(qpzonedb_t *qpdb, dns_qp_t *qp, bool create) { dns_qp_compact(qp, DNS_QPGC_MAYBE); dns_qpmulti_commit(qpdb->tree, &qp); } else { - dns_qpread_t *qprp = (dns_qpread_t*) qp; + dns_qpread_t *qprp = (dns_qpread_t *)qp; dns_qpread_destroy(qpdb->tree, qprp); } } static isc_result_t -findnodeintree(qpzonedb_t *qpdb, dns_qp_t *qp, const dns_name_t *name, bool create, - bool nsec3, dns_dbnode_t **nodep DNS__DB_FLARG) { +findnodeintree(qpzonedb_t *qpdb, dns_qp_t *qp, const dns_name_t *name, + bool create, bool nsec3, dns_dbnode_t **nodep DNS__DB_FLARG) { isc_result_t result; qpznode_t *node = NULL; dns_namespace_t nspace = nsec3 ? DNS_DBNAMESPACE_NSEC3 @@ -2547,7 +2547,8 @@ qpzone_findnode(dns_db_t *db, const dns_name_t *name, bool create, dns_qpread_t qpr = { 0 }; dns_qp_t *qp = begin_transaction(qpdb, &qpr, create); - isc_result_t result = findnodeintree(qpdb, qp, name, create, false, nodep DNS__DB_FLARG_PASS); + isc_result_t result = findnodeintree(qpdb, qp, name, create, false, + nodep DNS__DB_FLARG_PASS); end_transaction(qpdb, qp, create); @@ -2564,7 +2565,8 @@ qpzone_findnsec3node(dns_db_t *db, const dns_name_t *name, bool create, dns_qpread_t qpr = { 0 }; dns_qp_t *qp = begin_transaction(qpdb, &qpr, create); - isc_result_t result = findnodeintree(qpdb, qp, name, create, true, nodep DNS__DB_FLARG_PASS); + isc_result_t result = findnodeintree(qpdb, qp, name, create, true, + nodep DNS__DB_FLARG_PASS); end_transaction(qpdb, qp, create); @@ -4667,11 +4669,10 @@ qpzone_createiterator(dns_db_t *db, unsigned int options, */ static isc_result_t qpzone_addrdataset_inner(dns_db_t *db, dns_dbnode_t *dbnode, - dns_dbversion_t *dbversion, - isc_stdtime_t now ISC_ATTR_UNUSED, dns_rdataset_t *rdataset, - unsigned int options, - dns_rdataset_t *addedrdataset, - dns_qp_t *nsec) { + dns_dbversion_t *dbversion, + isc_stdtime_t now ISC_ATTR_UNUSED, + dns_rdataset_t *rdataset, unsigned int options, + dns_rdataset_t *addedrdataset, dns_qp_t *nsec) { isc_result_t result; qpzonedb_t *qpdb = (qpzonedb_t *)db; qpznode_t *node = (qpznode_t *)dbnode; @@ -4732,7 +4733,6 @@ qpzone_addrdataset_inner(dns_db_t *db, dns_dbnode_t *dbnode, newheader->resign_lsb = rdataset->resign & 0x1; } - /* * Add to the auxiliary NSEC tree if we're adding an NSEC record. */ @@ -5388,9 +5388,11 @@ qpzone_update_rdataset(qpzonedb_t *qpdb, qpz_version_t *version, dns_qp_t *qp, dns_rdataset_init(&ardataset); - is_nsec3 = (rds->type == dns_rdatatype_nsec3 || rds->covers == dns_rdatatype_nsec3); + is_nsec3 = (rds->type == dns_rdatatype_nsec3 || + rds->covers == dns_rdatatype_nsec3); - result = findnodeintree(qpdb, qp, name, true, is_nsec3, &node DNS__DB_FLARG_PASS); + result = findnodeintree(qpdb, qp, name, true, is_nsec3, + &node DNS__DB_FLARG_PASS); if (result != ISC_R_SUCCESS) { goto failure; @@ -5405,25 +5407,24 @@ qpzone_update_rdataset(qpzonedb_t *qpdb, qpz_version_t *version, dns_qp_t *qp, */ options = DNS_DBADD_MERGE | DNS_DBADD_EXACT | DNS_DBADD_EXACTTTL; - result = qpzone_addrdataset_inner((dns_db_t *)qpdb, node, - (dns_dbversion_t *)version, 0, - rds, options, - &ardataset, qp DNS__DB_FLARG_PASS); + result = qpzone_addrdataset_inner( + (dns_db_t *)qpdb, node, (dns_dbversion_t *)version, 0, + rds, options, &ardataset, qp DNS__DB_FLARG_PASS); break; case DNS_DIFFOP_DEL: case DNS_DIFFOP_DELRESIGN: options = DNS_DBSUB_EXACT | DNS_DBSUB_WANTOLD; - result = qpzone_subtractrdataset((dns_db_t *)qpdb, node, - (dns_dbversion_t *)version, - rds, options, - &ardataset DNS__DB_FLARG_PASS); + result = qpzone_subtractrdataset( + (dns_db_t *)qpdb, node, (dns_dbversion_t *)version, rds, + options, &ardataset DNS__DB_FLARG_PASS); break; default: UNREACHABLE(); } bool is_resign = rds->type == dns_rdatatype_rrsig && - (op == DNS_DIFFOP_DELRESIGN || op == DNS_DIFFOP_ADDRESIGN); + (op == DNS_DIFFOP_DELRESIGN || + op == DNS_DIFFOP_ADDRESIGN); if (result == ISC_R_SUCCESS && is_resign) { isc_stdtime_t resign; @@ -5448,19 +5449,21 @@ qpzone_update_callback(void *arg, const dns_name_t *name, dns_rdataset_t *rds, qpzonedb_t *qpdb = (qpzonedb_t *)ctx->base.db; qpz_version_t *version = (qpz_version_t *)ctx->base.ver; - return qpzone_update_rdataset(qpdb, version, ctx->qp, (dns_name_t *)name, rds, op); + return qpzone_update_rdataset(qpdb, version, ctx->qp, + (dns_name_t *)name, rds, op); } static isc_result_t -qpzone_beginupdate(dns_db_t *db, dns_dbversion_t *ver, dns_rdatacallbacks_t *callbacks) { +qpzone_beginupdate(dns_db_t *db, dns_dbversion_t *ver, + dns_rdatacallbacks_t *callbacks) { qpzonedb_t *qpdb = (qpzonedb_t *)db; REQUIRE(VALID_QPZONE(qpdb)); REQUIRE(ver != NULL); REQUIRE(DNS_CALLBACK_VALID(callbacks)); - qpzone_updatectx_t* ctx = isc_mem_get(qpdb->common.mctx, sizeof(*ctx)); - *ctx = (qpzone_updatectx_t) { + qpzone_updatectx_t *ctx = isc_mem_get(qpdb->common.mctx, sizeof(*ctx)); + *ctx = (qpzone_updatectx_t){ .base.db = db, .base.ver = ver, .base.warn = true, diff --git a/tests/dns/master_test.c b/tests/dns/master_test.c index 931f7017cac..9a367814867 100644 --- a/tests/dns/master_test.c +++ b/tests/dns/master_test.c @@ -65,8 +65,8 @@ static void rawdata_callback(dns_zone_t *zone, dns_masterrawheader_t *header); static isc_result_t -add_callback(void *arg, const dns_name_t *owner, - dns_rdataset_t *dataset, dns_diffop_t op DNS__DB_FLARG) { +add_callback(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset, + dns_diffop_t op DNS__DB_FLARG) { char buf[BIGBUFLEN]; isc_buffer_t target; isc_result_t result; diff --git a/tests/dns/qpzone_test.c b/tests/dns/qpzone_test.c index 3d6016c7796..5a369ec29e9 100644 --- a/tests/dns/qpzone_test.c +++ b/tests/dns/qpzone_test.c @@ -51,19 +51,18 @@ /* * Macro that uses a for loop to execute a cleanup at the end of scope. */ -#define WITH_NEWVERSION(db, version_var, should_commit) \ - for (dns_dbversion_t *version_var = NULL, \ - *_tmp = ({ \ - isc_result_t _result = dns_db_newversion(db, &version_var); \ - assert_int_equal(_result, ISC_R_SUCCESS); \ - (dns_dbversion_t*)1; \ - }); \ - _tmp != NULL; \ - _tmp = ({ \ - dns_db_closeversion(db, &version_var, should_commit); \ - (dns_dbversion_t*)NULL; \ - })) - +#define WITH_NEWVERSION(db, version_var, should_commit) \ + for (dns_dbversion_t *version_var = NULL, *_tmp = ({ \ + isc_result_t _result = dns_db_newversion(db, \ + &version_var); \ + assert_int_equal(_result, ISC_R_SUCCESS); \ + (dns_dbversion_t *)1; \ + }); \ + _tmp != NULL; \ + _tmp = ({ \ + dns_db_closeversion(db, &version_var, should_commit); \ + (dns_dbversion_t *)NULL; \ + })) const char *ownercase_vectors[12][2] = { { @@ -116,41 +115,41 @@ const char *ownercase_vectors[12][2] = { } }; -static unsigned char example_org_data[] = { 7, 'e', 'x', 'a', 'm', 'p', 'l', 'e', 3, 'o', 'r', 'g', 0 }; +static unsigned char example_org_data[] = { 7, 'e', 'x', 'a', 'm', 'p', 'l', + 'e', 3, 'o', 'r', 'g', 0 }; static dns_name_t example_org_name = DNS_NAME_INITABSOLUTE(example_org_data); /* IPv6 test addresses */ static unsigned char aaaa_test_data[][16] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, /* ::1 */ - { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2 } /* 2001:db8::2 */ + { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2 } /* 2001:db8::2 + */ }; /* RRSIG test signatures */ static unsigned char rrsig_signature1[64] = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, - 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, - 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, - 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, - 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, - 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, - 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40 + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, + 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, + 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, + 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, + 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40 }; static unsigned char rrsig_signature2[64] = { - 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, - 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, - 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, - 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, - 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, - 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, - 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, - 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80 + 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, + 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, + 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80 }; /* RRSIG test structures */ static dns_rdata_rrsig_t rrsig_test_data1 = { - .common = { .rdtype = dns_rdatatype_rrsig, .rdclass = dns_rdataclass_in }, + .common = { .rdtype = dns_rdatatype_rrsig, + .rdclass = dns_rdataclass_in }, .covered = dns_rdatatype_a, .algorithm = DST_ALG_RSASHA256, .labels = 2, @@ -164,7 +163,8 @@ static dns_rdata_rrsig_t rrsig_test_data1 = { }; static dns_rdata_rrsig_t rrsig_test_data2 = { - .common = { .rdtype = dns_rdatatype_rrsig, .rdclass = dns_rdataclass_in }, + .common = { .rdtype = dns_rdatatype_rrsig, + .rdclass = dns_rdataclass_in }, .covered = dns_rdatatype_a, .algorithm = DST_ALG_RSASHA256, .labels = 2, @@ -281,7 +281,8 @@ apply_dns_update(dns_db_t *db, dns_dbversion_t *version, const dns_name_t *name, dns_rdataset_init(&rdataset); dns_rdatalist_tordataset(&rdatalist, &rdataset); - isc_result_t callback_result = callbacks.update(callbacks.add_private, name, &rdataset, op); + isc_result_t callback_result = callbacks.update(callbacks.add_private, + name, &rdataset, op); assert_int_equal(result, ISC_R_SUCCESS); dns_rdataset_disassociate(&rdataset); @@ -404,35 +405,45 @@ ISC_RUN_TEST_IMPL(diffop_add_sub) { isc_result_t result; dns_db_t *db = NULL; - result = dns__qpzone_create(isc_g_mctx, &example_org_name, dns_dbtype_zone, - dns_rdataclass_in, 0, NULL, NULL, &db); + result = dns__qpzone_create(isc_g_mctx, &example_org_name, + dns_dbtype_zone, dns_rdataclass_in, 0, NULL, + NULL, &db); assert_int_equal(result, ISC_R_SUCCESS); assert_non_null(db); WITH_NEWVERSION(db, version, true) { - apply_dns_update(db, version, &example_org_name, dns_rdatatype_aaaa, - dns_rdataclass_in, 300, aaaa_test_data[0], 16, DNS_DIFFOP_ADD); + apply_dns_update(db, version, &example_org_name, + dns_rdatatype_aaaa, dns_rdataclass_in, 300, + aaaa_test_data[0], 16, DNS_DIFFOP_ADD); } WITH_NEWVERSION(db, version, true) { - result = apply_dns_update(db, version, &example_org_name, dns_rdatatype_aaaa, - dns_rdataclass_in, 300, aaaa_test_data[1], 16, DNS_DIFFOP_ADD); + result = apply_dns_update(db, version, &example_org_name, + dns_rdatatype_aaaa, dns_rdataclass_in, + 300, aaaa_test_data[1], 16, + DNS_DIFFOP_ADD); assert_int_equal(result, ISC_R_SUCCESS); - verify_aaaa_records(db, version, &example_org_name, aaaa_test_data, 2, 300); + verify_aaaa_records(db, version, &example_org_name, + aaaa_test_data, 2, 300); } WITH_NEWVERSION(db, version, true) { - result = apply_dns_update(db, version, &example_org_name, dns_rdatatype_aaaa, - dns_rdataclass_in, 300, aaaa_test_data[0], 16, DNS_DIFFOP_DEL); + result = apply_dns_update(db, version, &example_org_name, + dns_rdatatype_aaaa, dns_rdataclass_in, + 300, aaaa_test_data[0], 16, + DNS_DIFFOP_DEL); assert_int_equal(result, ISC_R_SUCCESS); - verify_aaaa_records(db, version, &example_org_name, &aaaa_test_data[1], 1, 300); + verify_aaaa_records(db, version, &example_org_name, + &aaaa_test_data[1], 1, 300); } WITH_NEWVERSION(db, version, false) { - result = apply_dns_update(db, version, &example_org_name, dns_rdatatype_aaaa, - dns_rdataclass_in, 600, aaaa_test_data[0], 16, DNS_DIFFOP_ADD); + result = apply_dns_update(db, version, &example_org_name, + dns_rdatatype_aaaa, dns_rdataclass_in, + 600, aaaa_test_data[0], 16, + DNS_DIFFOP_ADD); assert_int_equal(result, DNS_R_NOTEXACT); } @@ -450,39 +461,52 @@ ISC_RUN_TEST_IMPL(diffop_addresign) { unsigned char rrsig_data1[512], rrsig_data2[512]; isc_buffer_init(&buffer1, rrsig_data1, sizeof(rrsig_data1)); - result = dns_rdata_fromstruct(&rdata1, dns_rdataclass_in, dns_rdatatype_rrsig, &rrsig_test_data1, &buffer1); + result = dns_rdata_fromstruct(&rdata1, dns_rdataclass_in, + dns_rdatatype_rrsig, &rrsig_test_data1, + &buffer1); assert_int_equal(result, ISC_R_SUCCESS); isc_buffer_init(&buffer2, rrsig_data2, sizeof(rrsig_data2)); - result = dns_rdata_fromstruct(&rdata2, dns_rdataclass_in, dns_rdatatype_rrsig, &rrsig_test_data2, &buffer2); + result = dns_rdata_fromstruct(&rdata2, dns_rdataclass_in, + dns_rdatatype_rrsig, &rrsig_test_data2, + &buffer2); assert_int_equal(result, ISC_R_SUCCESS); - result = dns__qpzone_create(isc_g_mctx, &example_org_name, dns_dbtype_zone, - dns_rdataclass_in, 0, NULL, NULL, &db); + result = dns__qpzone_create(isc_g_mctx, &example_org_name, + dns_dbtype_zone, dns_rdataclass_in, 0, NULL, + NULL, &db); assert_int_equal(result, ISC_R_SUCCESS); assert_non_null(db); WITH_NEWVERSION(db, version, true) { - result = apply_dns_update(db, version, &example_org_name, dns_rdatatype_rrsig, - dns_rdataclass_in, 300, rdata1.data, rdata1.length, DNS_DIFFOP_ADDRESIGN); + result = apply_dns_update(db, version, &example_org_name, + dns_rdatatype_rrsig, + dns_rdataclass_in, 300, rdata1.data, + rdata1.length, DNS_DIFFOP_ADDRESIGN); assert_int_equal(result, ISC_R_SUCCESS); } WITH_NEWVERSION(db, version, true) { - result = apply_dns_update(db, version, &example_org_name, dns_rdatatype_rrsig, - dns_rdataclass_in, 300, rdata2.data, rdata2.length, DNS_DIFFOP_ADDRESIGN); + result = apply_dns_update(db, version, &example_org_name, + dns_rdatatype_rrsig, + dns_rdataclass_in, 300, rdata2.data, + rdata2.length, DNS_DIFFOP_ADDRESIGN); assert_int_equal(result, ISC_R_SUCCESS); } WITH_NEWVERSION(db, version, true) { - result = apply_dns_update(db, version, &example_org_name, dns_rdatatype_rrsig, - dns_rdataclass_in, 300, rdata1.data, rdata1.length, DNS_DIFFOP_DELRESIGN); + result = apply_dns_update(db, version, &example_org_name, + dns_rdatatype_rrsig, + dns_rdataclass_in, 300, rdata1.data, + rdata1.length, DNS_DIFFOP_DELRESIGN); assert_int_equal(result, ISC_R_SUCCESS); } WITH_NEWVERSION(db, version, true) { - result = apply_dns_update(db, version, &example_org_name, dns_rdatatype_rrsig, - dns_rdataclass_in, 300, rdata2.data, rdata2.length, DNS_DIFFOP_DELRESIGN); + result = apply_dns_update(db, version, &example_org_name, + dns_rdatatype_rrsig, + dns_rdataclass_in, 300, rdata2.data, + rdata2.length, DNS_DIFFOP_DELRESIGN); assert_int_equal(result, DNS_R_NXRRSET); }