simple include fixes

- <dnssec/**> -> <libdnssec/**>
- <zscanner/**> -> <libzscanner/**>

diff --git a/daemon/engine.c b/daemon/engine.c
index 2a2afa313c3b1d107b268953a0778abe8d1f33fc..9ea993e9fe0a04f6ad68d549ad04d9b9e0126e66 100644 (file)
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -22,7 +22,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <sys/param.h>
-#include <zscanner/scanner.h>
+#include <libzscanner/scanner.h>
 
 #include "daemon/engine.h"
 #include "daemon/bindings.h"

diff --git a/daemon/zimport.c b/daemon/zimport.c
index bc28a3d8d067648519ee5306dd588fb09fa7bb0c..b301cab6ecdf914863177739844cb6c06d56b5ed 100644 (file)
--- a/daemon/zimport.c
+++ b/daemon/zimport.c
@@ -49,7 +49,7 @@
 #include <uv.h>
 #include <ucw/mempool.h>
 #include <libknot/rrset.h>
-#include <zscanner/scanner.h>
+#include <libzscanner/scanner.h>
 
 #include "lib/utils.h"
 #include "lib/dnssec/ta.h"

diff --git a/lib/cache/impl.h b/lib/cache/impl.h
index 3ef8e4c6fc6306322c1d81f6a579828d715dfbb6..da1c75a7fee253cd591ec5d521133e644f713915 100644 (file)
--- a/lib/cache/impl.h
+++ b/lib/cache/impl.h
@@ -23,8 +23,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <dnssec/error.h>
-#include <dnssec/nsec.h>
+#include <libdnssec/error.h>
+#include <libdnssec/nsec.h>
 #include <libknot/consts.h>
 #include <libknot/db/db.h>
 #include <libknot/dname.h>

diff --git a/lib/dnssec.c b/lib/dnssec.c
index 0734ab83a2ce67b28a405f31f49b41c12fb42da3..568ad63badae2b2b469848d647c89b8c2d06157a 100644 (file)
--- a/lib/dnssec.c
+++ b/lib/dnssec.c
@@ -15,11 +15,11 @@
  */
 
 #include <assert.h>
-#include <dnssec/binary.h>
-#include <dnssec/crypto.h>
-#include <dnssec/error.h>
-#include <dnssec/key.h>
-#include <dnssec/sign.h>
+#include <libdnssec/binary.h>
+#include <libdnssec/crypto.h>
+#include <libdnssec/error.h>
+#include <libdnssec/key.h>
+#include <libdnssec/sign.h>
 #include <libknot/descriptor.h>
 #include <libknot/packet/wire.h>
 #include <libknot/rdataset.h>

diff --git a/lib/dnssec/nsec.c b/lib/dnssec/nsec.c
index 5b961dc42d894fa0b218bb0aebe99242db6b4658..454c36974670e2e27588a6716749903789ae2e0d 100644 (file)
--- a/lib/dnssec/nsec.c
+++ b/lib/dnssec/nsec.c
@@ -15,6 +15,7 @@
  */
 
 #include <assert.h>
+#include <stdlib.h>
 
 #include <libknot/descriptor.h>
 #include <libknot/dname.h>
@@ -22,7 +23,7 @@
 #include <libknot/rrset.h>
 #include <libknot/rrtype/nsec.h>
 #include <libknot/rrtype/rrsig.h>
-#include <dnssec/error.h>
+#include <libdnssec/error.h>
 
 #include "lib/defines.h"
 #include "lib/dnssec/nsec.h"

diff --git a/lib/dnssec/nsec3.c b/lib/dnssec/nsec3.c
index 7dafda7510239df38dc635b1ec9a468908292a86..ef0944bbb53259329164fed538024d9914ef5716 100644 (file)
--- a/lib/dnssec/nsec3.c
+++ b/lib/dnssec/nsec3.c
@@ -17,9 +17,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include <dnssec/binary.h>
-#include <dnssec/error.h>
-#include <dnssec/nsec.h>
+#include <libdnssec/binary.h>
+#include <libdnssec/error.h>
+#include <libdnssec/nsec.h>
 #include <libknot/descriptor.h>
 #include <contrib/base32hex.h>
 #include <libknot/rrset.h>

diff --git a/lib/dnssec/signature.c b/lib/dnssec/signature.c
index 421ae1484e1f1173c249069157694898a9fee10d..928520f16bca3b07292ae6edcb3f8443aaa5b8dc 100644 (file)
--- a/lib/dnssec/signature.c
+++ b/lib/dnssec/signature.c
@@ -18,9 +18,9 @@
 #include <assert.h>
 #include <string.h>
 
-#include <dnssec/error.h>
-#include <dnssec/key.h>
-#include <dnssec/sign.h>
+#include <libdnssec/error.h>
+#include <libdnssec/key.h>
+#include <libdnssec/sign.h>
 #include <libknot/descriptor.h>
 #include <libknot/packet/rrset-wire.h>
 #include <libknot/packet/wire.h>

diff --git a/lib/dnssec/signature.h b/lib/dnssec/signature.h
index 7bc2abe57ea49d91d4b93f7629dbb8abf04fd73e..1e0f081baef122fbc0a170f4f33d321bea2eac6d 100644 (file)
--- a/lib/dnssec/signature.h
+++ b/lib/dnssec/signature.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <dnssec/key.h>
+#include <libdnssec/key.h>
 #include <libknot/rrset.h>
 
 /**

diff --git a/lib/dnssec/ta.c b/lib/dnssec/ta.c
index 28d26724f9aec33c2eacbf7d12e333a06787ce95..2489d348243b2abcb900375ce53d42bfb65f0597 100644 (file)
--- a/lib/dnssec/ta.c
+++ b/lib/dnssec/ta.c
@@ -19,8 +19,8 @@
 #include <libknot/rdataset.h>
 #include <libknot/rrset.h>
 #include <libknot/packet/wire.h>
-#include <dnssec/key.h>
-#include <dnssec/error.h>
+#include <libdnssec/key.h>
+#include <libdnssec/error.h>
 
 #include "lib/defines.h"
 #include "lib/dnssec/ta.h"

diff --git a/lib/layer/validate.c b/lib/layer/validate.c
index 11237cc8b381b7fae25bf95b5f981e6587f46bc0..4c3f55817638367b73cba41075abaf7cdc7993e7 100644 (file)
--- a/lib/layer/validate.c
+++ b/lib/layer/validate.c
@@ -24,7 +24,7 @@
 #include <libknot/packet/wire.h>
 #include <libknot/rrtype/rdname.h>
 #include <libknot/rrtype/rrsig.h>
-#include <dnssec/error.h>
+#include <libdnssec/error.h>
 
 #include "lib/dnssec/nsec.h"
 #include "lib/dnssec/nsec3.h"

diff --git a/lib/zonecut.c b/lib/zonecut.c
index cd11d2970a00d4b73985401d125cbda9fc63b89d..ae8425f5c9cc2faa299a9728f0e44f537907fa93 100644 (file)
--- a/lib/zonecut.c
+++ b/lib/zonecut.c
@@ -18,7 +18,6 @@
 #include <libknot/rrtype/rdname.h>
 #include <libknot/packet/wire.h>
 #include <libknot/descriptor.h>
-#include <libknot/rrtype/aaaa.h>
 
 #include "lib/zonecut.h"
 #include "lib/rplan.h"

diff --git a/modules/hints/hints.c b/modules/hints/hints.c
index 315678460471295b631672377bbf1b47192910aa..30f17861b38f64d81194af6ac951d9e690d709a8 100644 (file)
--- a/modules/hints/hints.c
+++ b/modules/hints/hints.c
@@ -23,7 +23,6 @@
 
 #include <libknot/packet/pkt.h>
 #include <libknot/descriptor.h>
-#include <libknot/rrtype/aaaa.h>
 #include <ccan/json/json.h>
 #include <ucw/mempool.h>
 #include <contrib/cleanup.h>