diff options
Diffstat (limited to 'lib/dns/rdata/generic/keydata_65533.c')
| -rw-r--r-- | lib/dns/rdata/generic/keydata_65533.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lib/dns/rdata/generic/keydata_65533.c b/lib/dns/rdata/generic/keydata_65533.c index 00cf084eb62ab..3be76989f7bf3 100644 --- a/lib/dns/rdata/generic/keydata_65533.c +++ b/lib/dns/rdata/generic/keydata_65533.c @@ -33,7 +33,7 @@ fromtext_keydata(ARGS_FROMTEXT) { dns_keyflags_t flags; isc_uint32_t refresh, addhd, removehd; - REQUIRE(type == 65533); + REQUIRE(type == dns_rdatatype_keydata); UNUSED(type); UNUSED(rdclass); @@ -98,11 +98,11 @@ totext_keydata(ARGS_TOTEXT) { char buf[sizeof("64000")]; unsigned int flags; unsigned char algorithm; - unsigned long refresh, add, remove; + unsigned long refresh, add, delete; char algbuf[DNS_NAME_FORMATSIZE]; const char *keyinfo; - REQUIRE(rdata->type == 65533); + REQUIRE(rdata->type == dns_rdatatype_keydata); if ((tctx->flags & DNS_STYLEFLAG_KEYDATA) == 0 || rdata->length < 16) return (unknown_totext(rdata, tctx, target)); @@ -122,9 +122,9 @@ totext_keydata(ARGS_TOTEXT) { RETERR(str_totext(" ", target)); /* remove hold-down */ - remove = uint32_fromregion(&sr); + delete = uint32_fromregion(&sr); isc_region_consume(&sr, 4); - RETERR(dns_time32_totext(remove, target)); + RETERR(dns_time32_totext(delete, target)); RETERR(str_totext(" ", target)); /* flags */ @@ -206,7 +206,7 @@ totext_keydata(ARGS_TOTEXT) { isc_time_formathttptimestamp(&t, rbuf, sizeof(rbuf)); RETERR(str_totext(rbuf, target)); - if (add == 0) { + if (add == 0U) { RETERR(str_totext(tctx->linebreak, target)); RETERR(str_totext("; no trust", target)); } else { @@ -224,11 +224,11 @@ totext_keydata(ARGS_TOTEXT) { RETERR(str_totext(abuf, target)); } - if (remove != 0) { + if (delete != 0U) { RETERR(str_totext(tctx->linebreak, target)); RETERR(str_totext("; removal pending: ", target)); - isc_time_set(&t, remove, 0); + isc_time_set(&t, delete, 0); isc_time_formathttptimestamp(&t, dbuf, sizeof(dbuf)); RETERR(str_totext(dbuf, target)); @@ -243,7 +243,7 @@ static inline isc_result_t fromwire_keydata(ARGS_FROMWIRE) { isc_region_t sr; - REQUIRE(type == 65533); + REQUIRE(type == dns_rdatatype_keydata); UNUSED(type); UNUSED(rdclass); @@ -259,7 +259,7 @@ static inline isc_result_t towire_keydata(ARGS_TOWIRE) { isc_region_t sr; - REQUIRE(rdata->type == 65533); + REQUIRE(rdata->type == dns_rdatatype_keydata); UNUSED(cctx); @@ -274,7 +274,7 @@ compare_keydata(ARGS_COMPARE) { REQUIRE(rdata1->type == rdata2->type); REQUIRE(rdata1->rdclass == rdata2->rdclass); - REQUIRE(rdata1->type == 65533); + REQUIRE(rdata1->type == dns_rdatatype_keydata); dns_rdata_toregion(rdata1, &r1); dns_rdata_toregion(rdata2, &r2); @@ -285,7 +285,7 @@ static inline isc_result_t fromstruct_keydata(ARGS_FROMSTRUCT) { dns_rdata_keydata_t *keydata = source; - REQUIRE(type == 65533); + REQUIRE(type == dns_rdatatype_keydata); REQUIRE(source != NULL); REQUIRE(keydata->common.rdtype == type); REQUIRE(keydata->common.rdclass == rdclass); @@ -320,7 +320,7 @@ tostruct_keydata(ARGS_TOSTRUCT) { dns_rdata_keydata_t *keydata = target; isc_region_t sr; - REQUIRE(rdata->type == 65533); + REQUIRE(rdata->type == dns_rdatatype_keydata); REQUIRE(target != NULL); keydata->common.rdclass = rdata->rdclass; @@ -380,7 +380,7 @@ freestruct_keydata(ARGS_FREESTRUCT) { dns_rdata_keydata_t *keydata = (dns_rdata_keydata_t *) source; REQUIRE(source != NULL); - REQUIRE(keydata->common.rdtype == 65533); + REQUIRE(keydata->common.rdtype == dns_rdatatype_keydata); if (keydata->mctx == NULL) return; @@ -392,7 +392,7 @@ freestruct_keydata(ARGS_FREESTRUCT) { static inline isc_result_t additionaldata_keydata(ARGS_ADDLDATA) { - REQUIRE(rdata->type == 65533); + REQUIRE(rdata->type == dns_rdatatype_keydata); UNUSED(rdata); UNUSED(add); @@ -405,7 +405,7 @@ static inline isc_result_t digest_keydata(ARGS_DIGEST) { isc_region_t r; - REQUIRE(rdata->type == 65533); + REQUIRE(rdata->type == dns_rdatatype_keydata); dns_rdata_toregion(rdata, &r); @@ -415,7 +415,7 @@ digest_keydata(ARGS_DIGEST) { static inline isc_boolean_t checkowner_keydata(ARGS_CHECKOWNER) { - REQUIRE(type == 65533); + REQUIRE(type == dns_rdatatype_keydata); UNUSED(name); UNUSED(type); @@ -428,7 +428,7 @@ checkowner_keydata(ARGS_CHECKOWNER) { static inline isc_boolean_t checknames_keydata(ARGS_CHECKNAMES) { - REQUIRE(rdata->type == 65533); + REQUIRE(rdata->type == dns_rdatatype_keydata); UNUSED(rdata); UNUSED(owner); |