mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

kasp.c: return parenthesis (style) and REQUIRE

Browse Source 
This code was missing a lot of return parenthesis (violating our
style guide) and a missing REQUIRE in 'dns_kasplist_find()'.
This commit is contained in:
Matthijs Mekking
2019-11-04 12:04:52 +01:00
parent c3e0ac865f
commit 70da58c871
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/dns/kasp.c
View File

@@ -107,7 +107,7 @@ dns_kasp_detach(dns_kasp_t **kaspp) {
const char* const char*
dns_kasp_getname(dns_kasp_t *kasp) { dns_kasp_getname(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
return kasp->name; return (kasp->name);
} }
void void
@@ -135,77 +135,77 @@ uint32_t
dns_kasp_sigrefresh(dns_kasp_t *kasp) { dns_kasp_sigrefresh(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->signatures_refresh; return (kasp->signatures_refresh);
} }
uint32_t uint32_t
dns_kasp_sigvalidity(dns_kasp_t *kasp) { dns_kasp_sigvalidity(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->signatures_validity; return (kasp->signatures_validity);
} }
uint32_t uint32_t
dns_kasp_sigvalidity_dnskey(dns_kasp_t *kasp) { dns_kasp_sigvalidity_dnskey(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->signatures_validity_dnskey; return (kasp->signatures_validity_dnskey);
} }
dns_ttl_t dns_ttl_t
dns_kasp_dnskeyttl(dns_kasp_t *kasp) { dns_kasp_dnskeyttl(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->dnskey_ttl; return (kasp->dnskey_ttl);
} }
uint32_t uint32_t
dns_kasp_publishsafety(dns_kasp_t *kasp) { dns_kasp_publishsafety(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->publish_safety; return (kasp->publish_safety);
} }
uint32_t uint32_t
dns_kasp_retiresafety(dns_kasp_t *kasp) { dns_kasp_retiresafety(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->retire_safety; return (kasp->retire_safety);
} }
dns_ttl_t dns_ttl_t
dns_kasp_zonemaxttl(dns_kasp_t *kasp) { dns_kasp_zonemaxttl(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->zone_max_ttl; return (kasp->zone_max_ttl);
} }
uint32_t uint32_t
dns_kasp_zonepropagationdelay(dns_kasp_t *kasp) { dns_kasp_zonepropagationdelay(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->zone_propagation_delay; return (kasp->zone_propagation_delay);
} }
dns_ttl_t dns_ttl_t
dns_kasp_dsttl(dns_kasp_t *kasp) { dns_kasp_dsttl(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->parent_ds_ttl; return (kasp->parent_ds_ttl);
} }
uint32_t uint32_t
dns_kasp_parentpropagationdelay(dns_kasp_t *kasp) { dns_kasp_parentpropagationdelay(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->parent_propagation_delay; return (kasp->parent_propagation_delay);
} }
uint32_t uint32_t
dns_kasp_parentregistrationdelay(dns_kasp_t *kasp) { dns_kasp_parentregistrationdelay(dns_kasp_t *kasp) {
REQUIRE(DNS_KASP_VALID(kasp)); REQUIRE(DNS_KASP_VALID(kasp));
REQUIRE(kasp->frozen); REQUIRE(kasp->frozen);
return kasp->parent_registration_delay; return (kasp->parent_registration_delay);
} }
isc_result_t isc_result_t
@@ -213,6 +213,8 @@ dns_kasplist_find(dns_kasplist_t *list, const char *name, dns_kasp_t **kaspp)
{ {
dns_kasp_t *kasp = NULL; dns_kasp_t *kasp = NULL;
REQUIRE(kaspp != NULL && *kaspp == NULL);
if (list == NULL) { if (list == NULL) {
return (ISC_R_NOTFOUND); return (ISC_R_NOTFOUND);
} }
@@ -264,7 +266,7 @@ uint32_t
dns_kasp_key_algorithm(dns_kasp_key_t *key) { dns_kasp_key_algorithm(dns_kasp_key_t *key) {
REQUIRE(key != NULL); REQUIRE(key != NULL);
return key->algorithm; return (key->algorithm);
} }
unsigned int unsigned int
@@ -310,7 +312,7 @@ dns_kasp_key_size(dns_kasp_key_t *key) {
/* unsupported */ /* unsupported */
break; break;
} }
return size; return (size);
} }
uint32_t uint32_t