Fix header files to match implementation that is linked with.

diff --git a/ldns/dnssec_verify.h b/ldns/dnssec_verify.h
index 7cc492fac03651989b99aa391ddf8b18c1455b5b..58e74678b50d2af3e4eb38459866672ad468f42c 100644 (file)
--- a/ldns/dnssec_verify.h
+++ b/ldns/dnssec_verify.h
@@ -450,17 +450,6 @@ ldns_status ldns_verify_rrsig_keylist_notime(ldns_rr_list *rrset,
                                                           const ldns_rr_list *keys,
                                                           ldns_rr_list *good_keys);
 
-/**
- * convert dsa data
- *
- * \param[in] target_buffer Buffer to place the result in
- * \param[in] sig_rdf the rdata containing the DSA signature
- * \return LDNS_STATUS_OK on success, error code otherwise
- */
-ldns_status
-ldns_convert_dsa_rrsig_rdata(ldns_buffer *target_buffer,
-                             ldns_rdf *sig_rdf);
-
 /**
  * verify an rrsig with 1 key
  * \param[in] rrset the rrset

diff --git a/ldns/rbtree.h b/ldns/rbtree.h
index 14c3a721223869348ce95419789bf398cda54501..ac20dde17e83456a61d977a720927ee92907b3e0 100644 (file)
--- a/ldns/rbtree.h
+++ b/ldns/rbtree.h
@@ -187,15 +187,13 @@ ldns_rbnode_t *ldns_rbtree_previous(ldns_rbnode_t *rbtree);
  * of the name tree and return a new tree containing those
  * elements
  */
-ldns_rbtree_t *ldns_dnssec_rbtree_split(ldns_rbtree_t *tree, 
-                                                               size_t elements);
+ldns_rbtree_t *ldns_rbtree_split(ldns_rbtree_t *tree, size_t elements);
 
 /**
  * add all node from the second tree to the first (removing them from the
  * second), and fix up nsec(3)s if present
  */
-void ldns_dnssec_rbtree_join(ldns_rbtree_t *tree1,
-                                           ldns_rbtree_t *tree2);
+void ldns_rbtree_join(ldns_rbtree_t *tree1, ldns_rbtree_t *tree2);
 
 /**
  * Call with node=variable of struct* with rbnode_t as first element.

diff --git a/ldns/resolver.h b/ldns/resolver.h
index 7bc0412134ddba80320f273c004aa378b13ecc0f..80b853e1c3a1f93df0c505ae0ec56a353e9dba69 100644 (file)
--- a/ldns/resolver.h
+++ b/ldns/resolver.h
@@ -347,14 +347,6 @@ void ldns_resolver_incr_nameserver_count(ldns_resolver *r);
  */
 void ldns_resolver_dec_nameserver_count(ldns_resolver *r);
 
-/**
- * Set the resolver's nameserver list directly. Note the
- * rr's should be A or AAAA 
- * \param[in] r the resolver
- * \param[in] ns the rr's to use as nameservers
- */
-void ldns_resolver_set_nameserver_rrlist(ldns_resolver *r, ldns_rr_list *ns);
-
 /**
  * Set the resolver's nameserver count directly.
  * \param[in] r the resolver

diff --git a/ldns/rr.h b/ldns/rr.h
index b225a155af6e7e8b4b6a6adb8d1046234c1e45a0..f9ae0c18fc19d9737c05b25df4d32441aaa9512d 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -726,7 +726,6 @@ void ldns_rr_list_sort(ldns_rr_list *unsorted);
  *         +1 if rr2 comes before rr1
  */
 int ldns_rr_compare(const ldns_rr *rr1, const ldns_rr *rr2);
-int ldns_rr_compare_nsec3(const ldns_rr *rr1, const ldns_rr *rr2);
 
 /**
  * compares two rrs, up to the rdata.

diff --git a/ldns/str2host.h b/ldns/str2host.h
index a9ded13e366f0d20b180a1534be64c4c065b42fa..cccad01b3831d305cf80e020a0f36b44ae6d20bb 100644 (file)
--- a/ldns/str2host.h
+++ b/ldns/str2host.h
@@ -58,13 +58,6 @@ ldns_status ldns_str2rdf_int32(ldns_rdf **rd, const char *longstr);
  */
 ldns_status ldns_str2rdf_time(ldns_rdf **rd, const char *time);
 
-/* convert string with NSEC3 vars to wireformat) 
- * \param[in] rd the rdf where to put the data
- * \param[in] str the string to be converted
- * return ldns_status
- */
-ldns_status ldns_str2rdf_nsec3_vars(ldns_rdf **rd, const char *nsec3_vars);
-
 /* convert string with NSEC3 salt to wireformat) 
  * \param[in] rd the rdf where to put the data
  * \param[in] str the string to be converted
@@ -159,14 +152,6 @@ ldns_status ldns_str2rdf_type(ldns_rdf **rd, const char *str);
  */
 ldns_status ldns_str2rdf_class(ldns_rdf **rd, const char *str);
 
-/**
- * convert string with a CERT RR into wireformat
- * \param[in] rd the rdf where to put the data
- * \param[in] str the string to be converted
- * \return ldns_status
- */
-ldns_status ldns_str2rdf_cert(ldns_rdf **rd, const char *str);
-
 /**
  * convert an certificate algorithm value into wireformat
  * \param[in] rd the rdf where to put the data

diff --git a/ldns/update.h b/ldns/update.h
index 2148dd3714b1ba2429f7ec973eabce0c71c2aa4a..1d0d8f8ef2e284b02fb964fe48eeea72f59626c5 100644 (file)
--- a/ldns/update.h
+++ b/ldns/update.h
@@ -66,13 +66,13 @@ uint16_t ldns_update_upcount(const ldns_pkt *p);
  * \param[in] p the packet
  * \return the ad count
  */
-uint16_t ldns_update_adcount(const ldns_pkt *p);
+uint16_t ldns_update_ad(const ldns_pkt *p);
 /**
  * Set the zo count
  * \param[in] p the packet
  * \param[in] c the zo count to set
  */
-void ldns_update_set_zocount(ldns_pkt *p, uint16_t c);
+void ldns_update_set_zo(ldns_pkt *p, uint16_t c);
 /**
  * Set the pr count
  * \param[in] p the packet