Add const and static where needed.

Index: ldns/util.h.in
===================================================================
--- ldns/util.h.in	(.../vendor/ldns/dist)	(revision 266773)
+++ ldns/util.h.in	(.../head/contrib/ldns)	(revision 266773)
@@ -70,9 +70,9 @@
 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 @@
 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)
Index: host2str.c
===================================================================
--- host2str.c	(.../vendor/ldns/dist)	(revision 266773)
+++ host2str.c	(.../head/contrib/ldns)	(revision 266773)
@@ -511,7 +511,7 @@
 	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)
 {
@@ -837,7 +837,7 @@
 	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)
 {
@@ -1280,7 +1280,7 @@
 	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)
 {


Add missing prototypes.

Index: ldns/dname.h
===================================================================
--- ldns/dname.h	(.../vendor/ldns/dist)	(revision 266773)
+++ ldns/dname.h	(.../head/contrib/ldns)	(revision 266773)
@@ -150,6 +150,7 @@
  * \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
Index: ldns/resolver.h
===================================================================
--- ldns/resolver.h	(.../vendor/ldns/dist)	(revision 266773)
+++ ldns/resolver.h	(.../head/contrib/ldns)	(revision 266773)
@@ -740,6 +740,12 @@
 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
  * \return bool true if axfr transfer was completed without error


Remove duplicate prototype.

Index: ldns/dnssec_verify.h
===================================================================
--- ldns/dnssec_verify.h	(.../vendor/ldns/dist)	(revision 266773)
+++ ldns/dnssec_verify.h	(.../head/contrib/ldns)	(revision 266773)
@@ -294,24 +294,7 @@
 	    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
  *
  * \param[in] new_tree The trust tree that we are building