make doc creates all documentation

doc/Makefile now creates the manual pages

Only need to fix/create make install

diff --git a/Makefile.in b/Makefile.in
index 0e8b9f45eba678b19a4131625e90635175a2148b..a38cfbee66b2fba5e5d65ef35dcdb7b9020f0eb1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,6 +104,7 @@ run-test19: run-test19.o $(LIBDNS_OBJECTS) $(LIBOBJS)
 
 doc:   
        doxygen libdns.doxygen
+       (cd doc; make)
 
 clean: 
        rm -f *.o *.d *.lo

diff --git a/doc/Makefile b/doc/Makefile
index 8b7785c44e1d8bcebcaf5f30d8d74216edadc90e..dbaf0d633a9ea3798039ab9c73378d5b48aac52f 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,14 +1,9 @@
-
-str2host.xml: html/str2host_8c.html 
-       links -dump html/str2host_8c.html | ./make-xml-from-dox.pl > str2host.xml
-
-API2.xml: str2host.xml API-header.xml API-footer.xml
-       cat API-header.xml str2host.xml API-footer.xml > API2.xml
-       xml2rfc API2.xml
+all:   function_manpages
+        cat ../ldns/*.h | ./doxyparse.pl -m function_manpages  
 
 clean:
        rm -f *.txt
-       rm -f str2host.xml
-       rm -f API2.xml
        rm -f *.html
-
+       rm -rf html
+       rm -rf man
+       rm -rf latex

diff --git a/doc/Makefile.manpages b/doc/Makefile.manpages
deleted file mode 100644 (file)
index 58e79e6..0000000
--- a/doc/Makefile.manpages
+++ /dev/null
@@ -1,7 +0,0 @@
-all:   function_manpages
-       echo "./doxyparse.pl -m function_manpages < ../ldns/*.h"
-       echo "This doesn't do anything yet"
-
-clean:
-       rm -rf man/
-       

diff --git a/doc/rfc2629.dtd b/doc/rfc2629.dtd
deleted file mode 100644 (file)
index 9ae39b3..0000000
--- a/doc/rfc2629.dtd
+++ /dev/null
@@ -1,209 +0,0 @@
-<!--
-  DTD for the RFC document series, draft of 99-01-30
-  -->
-
-
-<!--
-  Contents
-
-    DTD data types
-
-    The top-level
-
-    Front matter
-
-    The Body
-
-    Back matter
-  -->
-
-
-<!--
-  DTD data types:
-
-        entity        description
-        ======        ===============================================
-        NUMBER        [0-9]+
-        NUMBERS       a comma-separated list of NUMBER
-
-        DAY           the day of the month, e.g., "1"
-        MONTH         the month of the year, e.g., "January"
-        YEAR          a four-digit year, e.g., "1999"
-
-        URI           e.g., "http://invisible.net/"
-
-        ATEXT/CTEXT   printable ASCII text (no line-terminators)
-
-        TEXT          character data
-  -->
-
-
-<!ENTITY % NUMBER     "CDATA">
-<!ENTITY % NUMBERS    "CDATA">
-
-<!ENTITY % DAY        "CDATA">
-<!ENTITY % MONTH      "CDATA">
-<!ENTITY % YEAR       "CDATA">
-
-<!ENTITY % URI        "CDATA">
-
-<!ENTITY % ATEXT      "CDATA">
-<!ENTITY % CTEXT      "#PCDATA">
-
-<!ENTITY % TEXT       "#PCDATA">
-
-<!ENTITY   rfc.number "XXXX">
-
-
-<!--
-  The top-level
-  -->
-
-
-<!--
-  attributes for the "rfc" element are supplied by the RFC
-  editor. when preparing drafts, authors should leave them blank.
-
-  the "seriesNo" attribute is used if the category is, e.g., BCP.
-  -->
-<!ELEMENT rfc         (front,middle,back?)>
-<!ATTLIST rfc
-          number      %NUMBER;           #IMPLIED
-          obsoletes   %NUMBERS;          ""
-          updates     %NUMBERS;          ""
-          category    (std|bcp|info|exp|historic)
-                                         "info"
-          seriesNo    %NUMBER;           #IMPLIED
-          ipr         (full2026|noDerivativeWorks2026|none)
-                                         #IMPLIED
-          docName     %ATEXT;            #IMPLIED> 
-
-<!--
-  Front matter
-  -->
-
-
-<!ELEMENT front       (title,author+,date,area*,workgroup*,keyword*,
-                       abstract?,note*)>
-
-<!-- the "abbrev" attribute is used for headers, etc. -->
-<!ELEMENT title       (%CTEXT;)>
-<!ATTLIST title
-          abbrev      %ATEXT;            #IMPLIED> 
-
-<!ELEMENT author      (organization,address?)>
-<!ATTLIST author
-          initials    %ATEXT;            #IMPLIED
-          surname     %ATEXT;            #IMPLIED
-          fullname    %ATEXT;            #IMPLIED>
-
-<!ELEMENT organization
-                      (%CTEXT;)>
-<!ATTLIST organization
-          abbrev      %ATEXT;            #IMPLIED> 
- 
-<!ELEMENT address     (postal?,phone?,facsimile?,email?,uri?)>
-
-<!-- at most one of each the city, region, code, and country
-     elements may be present -->
-<!ELEMENT postal      (street+,(city|region|code|country)*)>
-<!ELEMENT street      (%CTEXT;)>
-<!ELEMENT city        (%CTEXT;)>
-<!ELEMENT region      (%CTEXT;)>
-<!ELEMENT code        (%CTEXT;)>
-<!ELEMENT country     (%CTEXT;)>
-<!ELEMENT phone       (%CTEXT;)>
-<!ELEMENT facsimile   (%CTEXT;)>
-<!ELEMENT email       (%CTEXT;)>
-<!ELEMENT uri         (%CTEXT;)>
-
-<!ELEMENT date        EMPTY>
-<!ATTLIST date
-          day         %DAY;              #IMPLIED
-          month       %MONTH;            #REQUIRED
-          year        %YEAR;             #REQUIRED>
-
-<!-- meta-data... -->
-<!ELEMENT area        (%CTEXT;)>
-<!ELEMENT workgroup   (%CTEXT;)>
-<!ELEMENT keyword     (%CTEXT;)>
-
-<!ELEMENT abstract    (t)+>
-<!ELEMENT note        (t)+>
-<!ATTLIST note
-          title       %ATEXT;            #REQUIRED>
-
-
-<!--
-  The body
-  -->
-
-
-<!ELEMENT middle      (section)+>
-
-<!ELEMENT section     (t|figure|section)*>
-<!ATTLIST section
-          anchor      ID                 #IMPLIED
-          title       %ATEXT;            #REQUIRED>
-
-<!ELEMENT t           (%TEXT;|list|figure|xref|eref|iref|vspace)*>
-<!ATTLIST t
-          hangText    %ATEXT;            #IMPLIED>
-
-<!-- the value of the style attribute is inherited from the closest 
-     parent -->
-<!ELEMENT list        (t+)>
-<!ATTLIST list
-          style       (numbers|symbols|hanging|empty)
-                                         "empty">
-
-<!ELEMENT xref        (%CTEXT;)>
-<!ATTLIST xref
-          target      IDREF              #REQUIRED
-          pageno      (true|false)       "false">
-
-<!ELEMENT eref        (%CTEXT;)>
-<!ATTLIST eref
-          target      %URI;              #REQUIRED>
-
-<!ELEMENT iref        EMPTY>
-<!ATTLIST iref
-          item        %ATEXT;            #REQUIRED
-          subitem     %ATEXT;            "">
-
-<!ELEMENT vspace      EMPTY>
-<!ATTLIST vspace
-          blankLines  %NUMBER;           "0">
-
-<!ELEMENT figure      (preamble?,artwork,postamble?)>
-<!ATTLIST figure
-          anchor      ID                 #IMPLIED
-          title       %ATEXT;            "">
-
-<!ELEMENT preamble    (%TEXT;|xref|eref|iref)*>
-<!ELEMENT artwork     (%TEXT;)*>
-<!ATTLIST artwork
-          xml:space   (default|preserve) "preserve"
-          name        %ATEXT;            ""
-          type        %ATEXT;            "">
-
-<!ELEMENT postamble   (%TEXT;|xref|eref|iref)*>
-
-
-<!--
-  Back matter
-  -->
-
-
-<!-- sections, if present, are appendices -->
-<!ELEMENT back        (references?,section*)>
-
-<!ELEMENT references  (reference+)>
-<!ELEMENT reference   (front,seriesInfo*)>
-<!ATTLIST reference
-          anchor      ID                 #IMPLIED
-          target      %URI;              #IMPLIED>
-<!ELEMENT seriesInfo  EMPTY>
-<!ATTLIST seriesInfo
-          name        %ATEXT;            #REQUIRED
-          value       %ATEXT;            #REQUIRED>

diff --git a/ldns/host2wire.h b/ldns/host2wire.h
index 929c1a0ba5ffb5a53bccca800e92d24da555146c..8056aebb59657f67d29461001a880d8e5d4977af 100644 (file)
--- a/ldns/host2wire.h
+++ b/ldns/host2wire.h
@@ -45,7 +45,7 @@ ldns_status ldns_rr_rdata2buffer_wire(ldns_buffer *output, ldns_rr *rr);
 ldns_status ldns_pkt2buffer_wire(ldns_buffer *output, const ldns_pkt *pkt);
 
 
-ldns_status ldns_rr_list2buffer_wire(ldns_buffer *, ldns_rr_list *);
+ldns_status ldns_rr_list2buffer_wire(ldns_buffer *buf, ldns_rr_list *rrlist);
 
 /**
  * Allocates an array of uint8_t at dest, and puts the wireformat of the
@@ -80,6 +80,6 @@ ldns_status ldns_rr2wire(uint8_t **dest, const ldns_rr *rr, int, size_t *size);
  * length of the array, if it succeeds, and 0 otherwise (in which case
  * the function also returns NULL)
  */
-ldns_status ldns_pkt2wire(uint8_t **dest, const ldns_pkt *, size_t *);
+ldns_status ldns_pkt2wire(uint8_t **dest, const ldns_pkt *p, size_t *size);
 
 #endif