From a04479c321f39c618ef3011457e31b88ce781e97 Mon Sep 17 00:00:00 2001
From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Wed, 2 Dec 2015 14:31:45 +0100
Subject: [PATCH] contrib: move endian from internal
---
Knot.files | 2 +-
src/Makefile.am | 2 +-
src/{libknot/internal => contrib}/endian.h | 10 ++++++++++
src/knot/updates/acl.c | 2 +-
src/libknot/internal/utils.c | 2 +-
src/libknot/internal/wire_ctx.h | 2 +-
tests/endian.c | 2 +-
7 files changed, 16 insertions(+), 6 deletions(-)
rename src/{libknot/internal => contrib}/endian.h (95%)
diff --git a/Knot.files b/Knot.files
index 76edf39cf..41e1cdb5a 100644
--- a/Knot.files
+++ b/Knot.files
@@ -31,6 +31,7 @@ libtap/tap/float.h
libtap/tap/macros.h
samples/Makefile.am
src/Makefile.am
+src/contrib/endian.h
src/contrib/getline.c
src/contrib/getline.h
src/contrib/openbsd/strlcat.c
@@ -352,7 +353,6 @@ src/libknot/internal/base32hex.h
src/libknot/internal/base64.c
src/libknot/internal/base64.h
src/libknot/internal/consts.h
-src/libknot/internal/endian.h
src/libknot/internal/errcode.c
src/libknot/internal/errcode.h
src/libknot/internal/hhash.c
diff --git a/src/Makefile.am b/src/Makefile.am
index e5011a5c7..d202e4a2a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@ AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
libcontrib_ladir = $(includedir)
nobase_libcontrib_la_HEADERS = \
+ contrib/endian.h \
contrib/getline.h \
contrib/openbsd/strlcat.h \
contrib/openbsd/strlcpy.h \
@@ -73,7 +74,6 @@ nobase_libknot_internal_la_HEADERS = \
libknot/internal/base32hex.h \
libknot/internal/base64.h \
libknot/internal/consts.h \
- libknot/internal/endian.h \
libknot/internal/errcode.h \
libknot/internal/hhash.h \
libknot/internal/lists.h \
diff --git a/src/libknot/internal/endian.h b/src/contrib/endian.h
similarity index 95%
rename from src/libknot/internal/endian.h
rename to src/contrib/endian.h
index e92d6bccc..d49f9da37 100644
--- a/src/libknot/internal/endian.h
+++ b/src/contrib/endian.h
@@ -13,6 +13,14 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/*!
+ * \file
+ *
+ * \brief Endian dependent integer operations.
+ *
+ * \addtogroup contrib
+ * @{
+ */
#pragma once
@@ -56,3 +64,5 @@
# define htole32(x) OSSwapHostToLittleInt32(x)
# define htole64(x) OSSwapHostToLittleInt64(x)
#endif
+
+/*! @} */
diff --git a/src/knot/updates/acl.c b/src/knot/updates/acl.c
index 7d5697c2c..a0c6be4a1 100644
--- a/src/knot/updates/acl.c
+++ b/src/knot/updates/acl.c
@@ -22,10 +22,10 @@
#include <limits.h>
#include <stdbool.h>
+#include "contrib/endian.h"
#include "knot/updates/acl.h"
#include "knot/conf/conf.h"
#include "libknot/libknot.h"
-#include "libknot/internal/endian.h"
#include "libknot/internal/sockaddr.h"
#include "libknot/yparser/yptrafo.h"
diff --git a/src/libknot/internal/utils.c b/src/libknot/internal/utils.c
index 34d9f0efb..571651761 100644
--- a/src/libknot/internal/utils.c
+++ b/src/libknot/internal/utils.c
@@ -19,8 +19,8 @@
#include <fcntl.h>
#include <unistd.h>
+#include "contrib/endian.h"
#include "libknot/internal/utils.h"
-#include "libknot/internal/endian.h"
#include "libknot/internal/macros.h"
/*----------------------------------------------------------------------------*/
diff --git a/src/libknot/internal/wire_ctx.h b/src/libknot/internal/wire_ctx.h
index a96250f8f..25cd8fcc5 100644
--- a/src/libknot/internal/wire_ctx.h
+++ b/src/libknot/internal/wire_ctx.h
@@ -23,7 +23,7 @@
#include <string.h>
#include <sys/types.h>
-#include "libknot/internal/endian.h"
+#include "contrib/endian.h"
#include "libknot/internal/errcode.h"
#include "libknot/rdata.h"
diff --git a/tests/endian.c b/tests/endian.c
index a9366ffb1..48445a039 100644
--- a/tests/endian.c
+++ b/tests/endian.c
@@ -19,7 +19,7 @@
#include <string.h>
#include <tap/basic.h>
-#include "libknot/internal/endian.h"
+#include "contrib/endian.h"
int main(int argc, char *argv[])
{
--
GitLab