debugging for make doc test

fixed doxygen errors

diff --git a/ldns/keys.h b/ldns/keys.h
index 7ec2f4dafcae2969c620a63af4933278c4088a6b..239f20f3a0e3808d567e547a6ba181b08e914d69 100644 (file)
--- a/ldns/keys.h
+++ b/ldns/keys.h
@@ -132,16 +132,17 @@ ldns_key *ldns_key_new_frm_fp(FILE *fp);
  */
 ldns_key *ldns_key_new_frm_fp_l(FILE *fp, int *line_nr);
 
+#ifdef HAVE_SSL
 /**
  * frm_fp helper function. This function parsed the
  * remainder of the (RSA) priv. key file generated from bind9
  * \param[in] fp the file to parse
  * \return NULL on failure otherwise a RSA structure
  */
-#ifdef HAVE_SSL
 RSA *ldns_key_new_frm_fp_rsa(FILE *fp);
 #endif /* HAVE_SSL */
 
+#ifdef HAVE_SSL
 /**
  * frm_fp helper function. This function parsed the
  * remainder of the (RSA) priv. key file generated from bind9
@@ -149,20 +150,20 @@ RSA *ldns_key_new_frm_fp_rsa(FILE *fp);
  * \param[in] line_nr pointer to an integer containing the current line number (for debugging purposes)
  * \return NULL on failure otherwise a RSA structure
  */
-#ifdef HAVE_SSL
 RSA *ldns_key_new_frm_fp_rsa_l(FILE *fp, int *line_nr);
 #endif /* HAVE_SSL */
 
+#ifdef HAVE_SSL
 /**
  * frm_fp helper function. This function parsed the
  * remainder of the (DSA) priv. key file generated from bind9
  * \param[in] fp the file to parse
  * \return NULL on failure otherwise a RSA structure
  */
-#ifdef HAVE_SSL
 DSA *ldns_key_new_frm_fp_dsa(FILE *fp);
 #endif /* HAVE_SSL */
 
+#ifdef HAVE_SSL
 /**
  * frm_fp helper function. This function parsed the
  * remainder of the (DSA) priv. key file generated from bind9
@@ -170,7 +171,6 @@ DSA *ldns_key_new_frm_fp_dsa(FILE *fp);
  * \param[in] line_nr pointer to an integer containing the current line number (for debugging purposes)
  * \return NULL on failure otherwise a RSA structure
  */
-#ifdef HAVE_SSL
 DSA *ldns_key_new_frm_fp_dsa_l(FILE *fp, int *line_nr);
 #endif /* HAVE_SSL */
 
@@ -207,10 +207,12 @@ size_t ldns_key_list_key_count(ldns_key_list *key_list);
  */
 ldns_key *ldns_key_list_key(ldns_key_list *key, size_t nr);
 
+#ifdef HAVE_SSL
 /**
  * returns the (openssl) RSA struct contained in the key
+ * \param[in] k the key to look in
+ * \return the RSA * structure in the key
  */
-#ifdef HAVE_SSL
 RSA *ldns_key_rsa_key(ldns_key *k);
 #endif /* HAVE_SSL */
 

diff --git a/ldns/packet.h b/ldns/packet.h
index 4f1f015ad52f76396a697b3dd4d1feff0b20cc0c..23a1b38f68940e570fd60188b526f688e31cc48e 100644 (file)
--- a/ldns/packet.h
+++ b/ldns/packet.h
@@ -294,28 +294,28 @@ ldns_pkt *ldns_pkt_clone(ldns_pkt *pkt);
 /**
  * directly set the additional section
  * \param[in] p packet to operate on
- * \param[in[ rr rrlist to set
+ * \param[in] rr rrlist to set
  */
 void ldns_pkt_set_additional(ldns_pkt *p, ldns_rr_list *rr);
 
 /**
  * directly set the answer section
  * \param[in] p packet to operate on
- * \param[in[ rr rrlist to set
+ * \param[in] rr rrlist to set
  */
 void ldns_pkt_set_answer(ldns_pkt *p, ldns_rr_list *rr);
 
 /**
  * directly set the question section
  * \param[in] p packet to operate on
- * \param[in[ rr rrlist to set
+ * \param[in] rr rrlist to set
  */
 void ldns_pkt_set_question(ldns_pkt *p, ldns_rr_list *rr);
 
 /**
  * directly set the auhority section
  * \param[in] p packet to operate on
- * \param[in[ rr rrlist to set
+ * \param[in] rr rrlist to set
  */
 void ldns_pkt_set_authority(ldns_pkt *p, ldns_rr_list *rr);
 

diff --git a/ldns/resolver.h b/ldns/resolver.h
index 2a6dd5346321a908702f6b4e7fbf2a25c580490a..51b9e4c16155ed75e4af22f312d14539d52ed44a 100644 (file)
--- a/ldns/resolver.h
+++ b/ldns/resolver.h
@@ -471,7 +471,7 @@ void ldns_resolver_nameservers_randomize(ldns_resolver *r);
  * \param[in] zone zone name, if explicitly given, otherwise use SOA
  * \param[in] clas zone class
  * \param[in] tsig_cred TSIG credentials
- * \param[out] zone returns zone/owner rdf from the 'fqdn' SOA MNAME query
+ * \param[out] zone_rdf returns zone/owner rdf from the 'fqdn' SOA MNAME query
  * \return the new resolver
  */
 ldns_resolver * ldns_update_resolver_new(const char *fqdn, const char *zone, ldns_rr_class clas, ldns_tsig_credentials *tsig_cred, ldns_rdf **zone_rdf);

diff --git a/ldns/update.h b/ldns/update.h
index c9e98fb889eeddb14e2fa907a08b3c780bb3b7fd..ea3d1cfd5141ff1df97839db61cf75c831b9a9b5 100644 (file)
--- a/ldns/update.h
+++ b/ldns/update.h
@@ -15,8 +15,8 @@
 
 /**
  * create an update packet from zone name, class and the rr lists
- * \param[in] zone name of the zone
- * \param[in] class zone class
+ * \param[in] zone_rdf name of the zone
+ * \param[in] clas zone class
  * \param[in] pr_rrlist list of Prerequisite Section RRs
  * \param[in] up_rrlist list of Updates Section RRs
  * \param[in] ad_rrlist list of Additional Data Section RRs (currently unused)

diff --git a/test/09-doc-check.tpkg b/test/09-doc-check.tpkg
index 9b16aecc4c954fc3809b10113a1842611f958346..b40957c45036e6ced0645ed1b4665decce996e55 100644 (file)
--- a/test/09-doc-check.tpkg
+++ b/test/09-doc-check.tpkg
@@ -3,7 +3,7 @@
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 2006-01-09 12:55 CET by <miekg@floep>.
+# Made on 2006-01-20 15:38 CET by <miekg@elektron>.
 # Source directory was `/home/miekg/svn/libdns/trunk/test/09-doc-check.dir'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
@@ -63,7 +63,7 @@ else
 fi
 rm -f 200112312359.59 123123592001.59 123123592001.5 1231235901 $$.touch
 #
-if mkdir _sh13601; then
+if mkdir _sh25045; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -162,19 +162,19 @@ X        ;;
 esac
 X
 if [[ $A -lt 5 ]]; then
-X        exit 0
+X        exit 1
 else
 X        exit 1
 fi
 SHAR_EOF
-  (set 20 06 01 09 12 54 56 '09-doc-check.test'; eval "$shar_touch") &&
+  (set 20 06 01 20 15 38 53 '09-doc-check.test'; eval "$shar_touch") &&
   chmod 0600 '09-doc-check.test' ||
   $echo 'restore of' '09-doc-check.test' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo '09-doc-check.test:' 'MD5 check failed'
-81b1863bddd2c4fc7ca4efee2d09ce71  09-doc-check.test
+d7cc6e5e303553c5754c13d93da1046b  09-doc-check.test
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < '09-doc-check.test'`"
@@ -182,5 +182,5 @@ SHAR_EOF
     $echo '09-doc-check.test:' 'original size' '723,' 'current size' "$shar_count!"
   fi
 fi
-rm -fr _sh13601
+rm -fr _sh25045
 exit 0