From c0c45a9201b61d9d1de3b5ef1b0f3a381526f683 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Tue, 27 May 2014 23:52:29 +0200 Subject: [PATCH] Code cleanup --- host2str.c | 6 +++--- ldns/dname.h | 1 + ldns/dnssec_verify.h | 17 ----------------- ldns/resolver.h | 6 ++++++ ldns/util.h.in | 8 ++++---- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/host2str.c b/host2str.c index 5ad38457..445aa46b 100644 --- a/host2str.c +++ b/host2str.c @@ -511,7 +511,7 @@ ldns_rdf2buffer_str_hex(ldns_buffer *output, const ldns_rdf *rdf) return ldns_buffer_status(output); } -ldns_status +static ldns_status ldns_rdf2buffer_str_type_fmt(ldns_buffer *output, const ldns_output_format* fmt, const ldns_rdf *rdf) { @@ -836,7 +836,7 @@ ldns_rdf2buffer_str_wks(ldns_buffer *output, const ldns_rdf *rdf) return ldns_buffer_status(output); } -ldns_status +static ldns_status ldns_rdf2buffer_str_nsec_fmt(ldns_buffer *output, const ldns_output_format* fmt, const ldns_rdf *rdf) { @@ -1279,7 +1279,7 @@ ldns_rdf2buffer_str_hip(ldns_buffer *output, const ldns_rdf *rdf) return ldns_buffer_status(output); } -ldns_status +static ldns_status ldns_rdf2buffer_str_fmt(ldns_buffer *buffer, const ldns_output_format* fmt, const ldns_rdf *rdf) { diff --git a/ldns/dname.h b/ldns/dname.h index 16b45429..291786ba 100644 --- a/ldns/dname.h +++ b/ldns/dname.h @@ -150,6 +150,7 @@ bool ldns_dname_is_subdomain(const ldns_rdf *sub, const ldns_rdf *parent); * \return -1 if dname1 comes before dname2, 1 if dname1 comes after dname2, and 0 if they are equal. */ int ldns_dname_compare(const ldns_rdf *dname1, const ldns_rdf *dname2); +int ldns_dname_compare_v(const void *, const void *); /** * Checks whether the dname matches the given wildcard diff --git a/ldns/dnssec_verify.h b/ldns/dnssec_verify.h index 0c41e8c1..e8b1a910 100644 --- a/ldns/dnssec_verify.h +++ b/ldns/dnssec_verify.h @@ -294,23 +294,6 @@ void ldns_dnssec_derive_trust_tree_dnskey_rrset_time( ldns_rr *cur_rr, ldns_rr *cur_sig_rr, time_t check_time); - -/** - * Sub function for derive_trust_tree that is used for DNSKEY rrsets - * - * \param[in] new_tree The trust tree that we are building - * \param[in] data_chain The data chain containing the data for the trust tree - * \param[in] cur_rr The currently relevant DNSKEY RR - * \param[in] cur_sig_rr The currently relevant signature - * \param[in] check_time the time for which the validation is performed - */ -void ldns_dnssec_derive_trust_tree_dnskey_rrset_time( - ldns_dnssec_trust_tree *new_tree, - ldns_dnssec_data_chain *data_chain, - ldns_rr *cur_rr, ldns_rr *cur_sig_rr, - time_t check_time); - - /** * Sub function for derive_trust_tree that is used for DS rrsets * diff --git a/ldns/resolver.h b/ldns/resolver.h index f8400c51..a0f4b13c 100644 --- a/ldns/resolver.h +++ b/ldns/resolver.h @@ -741,6 +741,12 @@ void ldns_resolver_deep_free(ldns_resolver *res); */ ldns_rr* ldns_axfr_next(ldns_resolver *resolver); +/** + * Abort a transfer that is in progress + * \param[in] resolver the resolver that is used + */ +void ldns_axfr_abort(ldns_resolver *resolver); + /** * Returns true if the axfr transfer has completed (i.e. 2 SOA RRs and no errors were encountered * \param[in] resolver the resolver that is used diff --git a/ldns/util.h.in b/ldns/util.h.in index b6c9abe0..0fbc4e63 100644 --- a/ldns/util.h.in +++ b/ldns/util.h.in @@ -70,9 +70,9 @@ INLINE uint16_t ldns_read_uint16(const void *src) { #ifdef ALLOW_UNALIGNED_ACCESSES - return ntohs(*(uint16_t *) src); + return ntohs(*(const uint16_t *) src); #else - uint8_t *p = (uint8_t *) src; + const uint8_t *p = (const uint8_t *) src; return ((uint16_t) p[0] << 8) | (uint16_t) p[1]; #endif } @@ -81,9 +81,9 @@ INLINE uint32_t ldns_read_uint32(const void *src) { #ifdef ALLOW_UNALIGNED_ACCESSES - return ntohl(*(uint32_t *) src); + return ntohl(*(const uint32_t *) src); #else - uint8_t *p = (uint8_t *) src; + const uint8_t *p = (const uint8_t *) src; return ( ((uint32_t) p[0] << 24) | ((uint32_t) p[1] << 16) | ((uint32_t) p[2] << 8) -- 2.47.3