diff --git a/Knot.files b/Knot.files index 828c3d214..948b55c5d 100644 --- a/Knot.files +++ b/Knot.files @@ -457,7 +457,7 @@ src/libknot/descriptor.h src/libknot/dname.c src/libknot/dname.h src/libknot/dynarray.h -src/libknot/endian.h +src/libknot/knot_endian.h src/libknot/errcode.h src/libknot/error.c src/libknot/error.h diff --git a/src/contrib/openbsd/siphash.c b/src/contrib/openbsd/siphash.c index 26b8cfcbe..570611858 100644 --- a/src/contrib/openbsd/siphash.c +++ b/src/contrib/openbsd/siphash.c @@ -45,7 +45,7 @@ #include -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "contrib/string.h" #include "contrib/openbsd/siphash.h" diff --git a/src/contrib/toeplitz.h b/src/contrib/toeplitz.h index 02974d2ac..cca8f1cda 100644 --- a/src/contrib/toeplitz.h +++ b/src/contrib/toeplitz.h @@ -23,7 +23,7 @@ #include #include -#include "libknot/endian.h" +#include "libknot/knot_endian.h" /*! * \brief Computes a Toeplitz hash value for given key and data. diff --git a/src/contrib/wire_ctx.h b/src/contrib/wire_ctx.h index f4f178973..54c8de48b 100644 --- a/src/contrib/wire_ctx.h +++ b/src/contrib/wire_ctx.h @@ -24,7 +24,7 @@ #include #include "contrib/string.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/errcode.h" /*! diff --git a/src/knot/journal/journal_metadata.c b/src/knot/journal/journal_metadata.c index b13353426..1941278d2 100644 --- a/src/knot/journal/journal_metadata.c +++ b/src/knot/journal/journal_metadata.c @@ -16,7 +16,7 @@ #include "knot/journal/journal_metadata.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/error.h" static void fix_endian(void *data, size_t data_size, bool in) diff --git a/src/knot/journal/knot_lmdb.c b/src/knot/journal/knot_lmdb.c index bc174624c..908bab088 100644 --- a/src/knot/journal/knot_lmdb.c +++ b/src/knot/journal/knot_lmdb.c @@ -26,7 +26,7 @@ #include "contrib/files.h" #include "contrib/wire_ctx.h" #include "libknot/dname.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/error.h" #define LMDB_DIR_MODE 0770 diff --git a/src/libknot/Makefile.inc b/src/libknot/Makefile.inc index f62d83626..a2a8245d0 100755 --- a/src/libknot/Makefile.inc +++ b/src/libknot/Makefile.inc @@ -22,7 +22,7 @@ nobase_include_libknot_HEADERS = \ libknot/descriptor.h \ libknot/dname.h \ libknot/dynarray.h \ - libknot/endian.h \ + libknot/knot_endian.h \ libknot/errcode.h \ libknot/error.h \ libknot/libknot.h \ diff --git a/src/libknot/cookies.c b/src/libknot/cookies.c index e7b33547c..96fb8b8db 100644 --- a/src/libknot/cookies.c +++ b/src/libknot/cookies.c @@ -19,7 +19,7 @@ #include "libknot/attribute.h" #include "libknot/cookies.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/errcode.h" #include "contrib/string.h" #include "contrib/sockaddr.h" diff --git a/src/libknot/endian.h b/src/libknot/knot_endian.h similarity index 100% rename from src/libknot/endian.h rename to src/libknot/knot_endian.h diff --git a/src/libknot/libknot.h b/src/libknot/libknot.h index f62c2c746..5e74c8efc 100644 --- a/src/libknot/libknot.h +++ b/src/libknot/libknot.h @@ -33,7 +33,7 @@ #include "libknot/descriptor.h" #include "libknot/dname.h" #include "libknot/dynarray.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/errcode.h" #include "libknot/error.h" #include "libknot/lookup.h" diff --git a/src/libknot/probe/data.c b/src/libknot/probe/data.c index 5d831b252..0a5e1c1cb 100644 --- a/src/libknot/probe/data.c +++ b/src/libknot/probe/data.c @@ -20,7 +20,7 @@ #include #include "libknot/attribute.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/errcode.h" #include "libknot/probe/probe.h" #include "contrib/macros.h" diff --git a/src/libknot/quic/quic.c b/src/libknot/quic/quic.c index b5e57fc16..07f951b14 100644 --- a/src/libknot/quic/quic.c +++ b/src/libknot/quic/quic.c @@ -35,11 +35,10 @@ #include "contrib/sockaddr.h" #include "contrib/string.h" #include "contrib/ucw/lists.h" -#include "libknot/endian.h" #include "libdnssec/error.h" #include "libdnssec/random.h" +#include "libknot/knot_endian.h" #include "libknot/attribute.h" -#include "libknot/endian.h" #include "libknot/error.h" #include "libknot/wire.h" diff --git a/src/libknot/wire.h b/src/libknot/wire.h index 2f264c7d5..8b630875b 100644 --- a/src/libknot/wire.h +++ b/src/libknot/wire.h @@ -29,7 +29,7 @@ #include #include -#include "libknot/endian.h" +#include "libknot/knot_endian.h" /*! * \brief Reads 2 bytes from the wireformat data. diff --git a/src/libknot/xdp/bpf-user.c b/src/libknot/xdp/bpf-user.c index 449dffeaf..9eddf578d 100644 --- a/src/libknot/xdp/bpf-user.c +++ b/src/libknot/xdp/bpf-user.c @@ -21,7 +21,7 @@ #include #include -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/error.h" #include "libknot/xdp/bpf-kernel-obj.h" #include "libknot/xdp/bpf-user.h" diff --git a/src/libknot/xdp/eth.c b/src/libknot/xdp/eth.c index 608eb2041..8ad6acfe8 100644 --- a/src/libknot/xdp/eth.c +++ b/src/libknot/xdp/eth.c @@ -31,7 +31,7 @@ #include "contrib/openbsd/strlcpy.h" #include "contrib/sockaddr.h" #include "libknot/attribute.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/errcode.h" #include "libknot/xdp/eth.h" diff --git a/src/libknot/xdp/protocols.h b/src/libknot/xdp/protocols.h index dc3816aeb..8ea5e113d 100644 --- a/src/libknot/xdp/protocols.h +++ b/src/libknot/xdp/protocols.h @@ -23,7 +23,7 @@ #include #include -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/xdp/bpf-consts.h" #include "libknot/xdp/msg.h" diff --git a/src/libknot/xdp/tcp_iobuf.c b/src/libknot/xdp/tcp_iobuf.c index 156dd55c0..c03079e89 100644 --- a/src/libknot/xdp/tcp_iobuf.c +++ b/src/libknot/xdp/tcp_iobuf.c @@ -22,7 +22,7 @@ #include "contrib/macros.h" #include "libknot/attribute.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/error.h" #include "libknot/wire.h" diff --git a/src/libknot/xdp/xdp.c b/src/libknot/xdp/xdp.c index 0624253e6..9888641d6 100644 --- a/src/libknot/xdp/xdp.c +++ b/src/libknot/xdp/xdp.c @@ -26,7 +26,7 @@ #include #include "libknot/attribute.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/errcode.h" #include "libknot/xdp/bpf-consts.h" #include "libknot/xdp/bpf-user.h" diff --git a/src/libzscanner/functions.c b/src/libzscanner/functions.c index f6a1c44c0..301ae3818 100644 --- a/src/libzscanner/functions.c +++ b/src/libzscanner/functions.c @@ -20,7 +20,7 @@ #include "libzscanner/error.h" #include "libzscanner/functions.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" const uint8_t digit_to_num[] = { ['0'] = 0, ['1'] = 1, ['2'] = 2, ['3'] = 3, ['4'] = 4, diff --git a/tests/libknot/test_cookies.c b/tests/libknot/test_cookies.c index 82ba50228..416a056ef 100644 --- a/tests/libknot/test_cookies.c +++ b/tests/libknot/test_cookies.c @@ -20,7 +20,7 @@ #include #include "libknot/cookies.h" -#include "libknot/endian.h" +#include "libknot/knot_endian.h" #include "libknot/errcode.h" #include "contrib/sockaddr.h" diff --git a/tests/libknot/test_endian.c b/tests/libknot/test_endian.c index 30f16f7b6..7f3ca39df 100644 --- a/tests/libknot/test_endian.c +++ b/tests/libknot/test_endian.c @@ -19,7 +19,7 @@ #include #include -#include "libknot/endian.h" +#include "libknot/knot_endian.h" int main(int argc, char *argv[]) {