moved util.h to ldns/ dir so includes are still correct after having copied the heade...

diff --git a/Makefile.in b/Makefile.in
index ccd8b9fb2ff74253fb7f86101ac535b0a4deb5bc..d10975aced1a82bf071bc02fb72a7ee4218ba188 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,8 +46,9 @@ LIBDNS_HEADERS        =       ldns/error.h            \
                        ldns/higher.h           \
                        ldns/parse.h            \
                        ldns/rr_functions.h     \
+                       ldns/ldns.h             \
                        ldns/dns.h              \
-                       util.h
+                       ldns/util.h
 PROG_SOURCES   =       mx.c chaos.c
 PROG_TARGETS   =       $(PROG_SOURCES:.c=)
 

diff --git a/dname.c b/dname.c
index d89587785607990da2c151c07a99c5c89624502b..dceb14648b1e95b2c4a1a0b8e21b381338ff7d45 100644 (file)
--- a/dname.c
+++ b/dname.c
@@ -18,7 +18,7 @@
 #include <ldns/str2host.h>
 #include <ldns/dns.h>
 
-#include "util.h"
+#include "ldns/util.h"
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <netdb.h>

diff --git a/error.c b/error.c
index 05d44e18a27d8921fbd5125f9a609345d3a080e1..40ab72e37f9a9c31643f81551cf822bb8597158a 100644 (file)
--- a/error.c
+++ b/error.c
@@ -13,7 +13,7 @@
 #include <ldns/error.h>
 
 
-#include "util.h"
+#include "ldns/util.h"
 
 
 ldns_lookup_table ldns_error_str[] = {

diff --git a/higher.c b/higher.c
index 78ba2722d2891bdebe10411f2fa4202b743a2336..4984c9023b1860bc9b2d7b357b6d1053035e2a3c 100644 (file)
--- a/higher.c
+++ b/higher.c
@@ -19,7 +19,7 @@
 #include <ldns/resolver.h>
 #include <ldns/dns.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 ldns_rr_list *
 ldns_get_rr_list_addr_by_name(ldns_resolver *res, ldns_rdf *name, ldns_rr_class c, 

diff --git a/host2str.c b/host2str.c
index 82b94ff3d1b5fc590bf6657a56c9aacaf95052fd..2f4c811f1d29b5aa669f30fc6be8b8eed0ce2737 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -24,7 +24,7 @@
 #include <ldns/wire2host.h>
 #include <ldns/dns.h>
 
-#include <util.h>
+#include <ldns/util.h>
 
 /* lookup tables for standard DNS stuff  */
 

diff --git a/keys.c b/keys.c
index 476eb53571705d8e18f52375bc985375f8b89c7f..c4b19e7046e28713a9ec54b3aa4c7c2f5ec09046 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -9,7 +9,7 @@
 #include <config.h>
 #include <openssl/ssl.h>
 
-#include <util.h>
+#include <ldns/util.h>
 #include <ldns/dnssec.h>
 #include <ldns/keys.h>
 

diff --git a/ldns/buffer.h b/ldns/buffer.h
index c422c422625d3ed665e2a3a8685ec0bcc3fc30c2..137af3c811231519a231c5417207eed8fed3586c 100644 (file)
--- a/ldns/buffer.h
+++ b/ldns/buffer.h
@@ -20,7 +20,7 @@
 #include <ldns/error.h>
 #include <ldns/common.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 /**
  * number of initial bytes in buffer of

diff --git a/ldns/dns.h b/ldns/dns.h
index e5aeba5a2747fbd4933c8c80beab19a2834bdceb..5b5ae2e2651c5d295d858affd32c08f950691089 100644 (file)
--- a/ldns/dns.h
+++ b/ldns/dns.h
@@ -11,7 +11,7 @@
 #ifndef _DNS_H_
 #define _DNS_H_
 
-#include <util.h>
+#include <ldns/util.h>
 #include <ldns/buffer.h>
 #include <ldns/common.h>
 #include <ldns/dname.h>

diff --git a/ldns/error.h b/ldns/error.h
index 2ead22c128cca01497e39f21d3c9bb4916288ad8..8564b4737ff8e531cba2fda24a8b09ce624919b1 100644 (file)
--- a/ldns/error.h
+++ b/ldns/error.h
@@ -13,7 +13,7 @@
 #ifndef _ERROR_H
 #define _ERROR_H
 
-#include "util.h"
+#include "ldns/util.h"
 
 enum ldns_enum_status 
 {

diff --git a/ldns/host2str.h b/ldns/host2str.h
index 188d3c18256d961e5c36d37c413a2b185835ecb1..5380eb72e89b2ff934137012dc1426823742ccfe 100644 (file)
--- a/ldns/host2str.h
+++ b/ldns/host2str.h
@@ -11,7 +11,7 @@
 #include <ldns/resolver.h>
 #include <ctype.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 /** 
  * Converts an LDNS_RDF_TYPE_A rdata element to string format and adds it to the output buffer 

diff --git a/ldns/host2wire.h b/ldns/host2wire.h
index 298ddd093784eebf07a85beb91a112f951d1333e..323ebdba0422c7cc0093070bd5834910f7f3d787 100644 (file)
--- a/ldns/host2wire.h
+++ b/ldns/host2wire.h
@@ -10,7 +10,7 @@
 #include <ldns/buffer.h>
 #include <ctype.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 /**
  * Copies the rdata data to the buffer in wire format

diff --git a/ldns/keys.h b/ldns/keys.h
index dd391c8b0f5fe82823ed86b707e7c8e29e0f700f..3369e79f9b3c2f51fd14e6079cdb0ce60147651b 100644 (file)
--- a/ldns/keys.h
+++ b/ldns/keys.h
@@ -16,7 +16,7 @@
 
 #include <openssl/ssl.h>
 #include <ldns/dnssec.h>
-#include <util.h>
+#include <ldns/util.h>
 
 extern ldns_lookup_table ldns_signing_algorithms[];
 

diff --git a/util.h b/ldns/util.h
similarity index 100%
rename from util.h
rename to ldns/util.h

diff --git a/net.c b/net.c
index a469789bb40ceb96979e864c00fe508aa3752efb..8a9d4b3f45c4eca62b926bb9f382016060dd7243 100644 (file)
--- a/net.c
+++ b/net.c
@@ -22,7 +22,7 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 ldns_status
 ldns_send(ldns_pkt **result, ldns_resolver *r, ldns_pkt *query_pkt)

diff --git a/packet.c b/packet.c
index 928ffca0e4564a892a177af474bcc9e651f2bf74..aaa49448744982fa9a38acd5e20d4d33d1da9ec9 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -16,7 +16,7 @@
 #include <ldns/str2host.h>
 #include <ldns/host2str.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 /* Access functions 
  * do this as functions to get type checking

diff --git a/parse.c b/parse.c
index d58e05bd919f6ada3d86eefe44e4ec70ab02f00b..e6115ac769011a981d3168379aeb98194d24083c 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -18,7 +18,7 @@
 
 #include <ldns/rr.h>
 #include <ldns/dns.h>
-#include "util.h"
+#include "ldns/util.h"
 
 ssize_t
 ldns_fget_keyword_data(FILE *f, const char *keyword, const char *k_del, char *data, 

diff --git a/rdata.c b/rdata.c
index 77cca59bbc3f3f411c1c11f31fb94470a4ea559d..421bd0ee90ec678a514ecef827f065aee786f45c 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -17,7 +17,7 @@
 #include <ldns/str2host.h>
 #include <ldns/dns.h>
 
-#include "util.h"
+#include "ldns/util.h"
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <netdb.h>

diff --git a/resolver.c b/resolver.c
index 24156b8d74da331c22588dc64c5e99b57f443b02..58ffa681c0169859c9eac64959a3d160147145ed 100644 (file)
--- a/resolver.c
+++ b/resolver.c
@@ -17,7 +17,7 @@
 
 #include <strings.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 /* Access function for reading 
  * and setting the different Resolver 

diff --git a/rr.c b/rr.c
index a10d82e5e6ce284d6013fd3d8dc9a851f9906f9b..a92f2eceb952fce1a4aea2c3251954f92d42cc49 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -20,7 +20,7 @@
 #include <ldns/dns.h>
 #include <ldns/buffer.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 ldns_rr *
 ldns_rr_new(void)

diff --git a/rr_functions.c b/rr_functions.c
index f43a56cb0c0c4a5f75a0855ecba5a61d5b244f4e..f198837fd8894daefb79db7de64c5525bb8d92c6 100644 (file)
--- a/rr_functions.c
+++ b/rr_functions.c
@@ -21,7 +21,7 @@
 #include <ldns/dns.h>
 #include <ldns/rr_functions.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 /**
  * return a specific rdf

diff --git a/run-test0.c b/run-test0.c
index ec7f0acaff8b8945771b5ffe46ca4557291092e6..21cb9cfbe78af7d8b57f531680350fc708808990 100644 (file)
--- a/run-test0.c
+++ b/run-test0.c
@@ -8,7 +8,7 @@
 
 #include <ldns/ldns.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 /*
        0xc2, 0xb4, 0x81, 0x80, 0x00, 0x01, 0x00, 0x01,

diff --git a/str2host.c b/str2host.c
index 7c1c2bac3a46af8fb384f654ea902cdda8c18009..212b674385037ce93582ed6011998f3ec533ee84 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -16,7 +16,7 @@
 #include <ldns/dns.h>
 #include <ldns/rdata.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/util.c b/util.c
index 0d1d0b1a222d052c4e07693f402ac6bd178561b2..6b10a65357efb0d878a64752f3663a540e695019 100644 (file)
--- a/util.c
+++ b/util.c
@@ -14,7 +14,7 @@
 
 #include <ldns/rdata.h>
 #include <ldns/rr.h>
-#include <util.h>
+#include <ldns/util.h>
 #include <strings.h>
 
 #include <stdio.h>

diff --git a/wire2host.c b/wire2host.c
index eb5466e42fc8b51740975f7d229d49085f2fe916..3beb2840dd1ce1854734a424553ee54d9cbc4c25 100644 (file)
--- a/wire2host.c
+++ b/wire2host.c
@@ -18,7 +18,7 @@
 
 #include <ldns/wire2host.h>
 
-#include "util.h"
+#include "ldns/util.h"
 
 
 /*