Moved error messages for zcompile to separate file.

Knot.files

@@ -97,7 +97,6 @@ src/dnslib/tests/unittests_dnslib.c
 src/zcompile/parser-descriptor.h
 src/zcompile/parser-descriptor.c
 src/zcompile/parser-util.h
-src/zcompile/parser-util.c
 src/zcompile/zcompile.c
 src/zcompile/zcompile.h
 src/zcompile/zparser.y
@@ -130,8 +129,6 @@ src/knot/server/tcp-handler.c
 src/knot/server/tcp-handler.h
 src/knot/server/udp-handler.c
 src/knot/server/udp-handler.h
-src/knot/server/zones.c
-src/knot/server/zones.h
 src/knot/ctl/process.c
 src/knot/ctl/process.h
 src/knot/conf/cf-lex.l
@@ -156,3 +153,4 @@ src/tests/unittests_main.c
 tests/querytcp.c
 src/zcompile/tests/unittests_zp_main.c
 src/zcompile/tests/zcompile_tests.c
+src/zcompile/zcompile-error.c

src/Makefile.am

@@ -36,7 +36,7 @@ knotc_SOURCES =					\
 
 knot_zcompile_SOURCES =			\
 	zcompile/zcompile_main.c            \
-	zcompile/zcompile-error.h		\
+	zcompile/zcompile-error.c		\
 	zcompile/parser-util.h		\
 	zcompile/parser-descriptor.h		\
 	zcompile/zparser.y			\
@@ -69,7 +69,7 @@ unittests_dnslib_SOURCES =			\
 unittests_zcompile_SOURCES =		\
 	zcompile/parser-util.h		\
 	zcompile/parser-descriptor.h		\
-	zcompile/zcompile-error.h		\
+	zcompile/zcompile-error.c		\
 	zcompile/zparser.y			\
 	zcompile/zlexer.l			\
 	zcompile/zcompile.c			\

src/zcompile/zcompile-error.c

+#include "zcompile/zcompile-error.h"
+
+#include "common/errors.h"
+
+/*! \brief Table linking error messages to error codes. */
+const error_table_t knot_zcompile_error_msgs[KNOT_ZCOMPILE_ERROR_COUNT] = {
+
+	/* Mapped errors. */
+	{KNOT_ZCOMPILE_EOK, "OK"},
+	{KNOT_ZCOMPILE_ENOMEM, "Not enough memory."},
+	{KNOT_ZCOMPILE_EINVAL, "Invalid parameter passed."},
+	{KNOT_ZCOMPILE_ENOTSUP, "Parameter not supported."},
+	{KNOT_ZCOMPILE_EBUSY, "Requested resource is busy."},
+	{KNOT_ZCOMPILE_EAGAIN,
+	 "The system lacked the necessary resource, try again."},
+	{KNOT_ZCOMPILE_EACCES,
+	 "Permission to perform requested operation is denied."},
+	{KNOT_ZCOMPILE_ECONNREFUSED, "Connection is refused."},
+	{KNOT_ZCOMPILE_EISCONN, "Already connected."},
+	{KNOT_ZCOMPILE_EADDRINUSE, "Address already in use."},
+	{KNOT_ZCOMPILE_ENOENT, "Resource not found."},
+	{KNOT_ZCOMPILE_ERANGE, "Value is out of range."},
+
+	/* Custom errors. */
+	{KNOT_ZCOMPILE_ERROR, "Generic error."},
+	{KNOT_ZCOMPILE_EBRDATA, "Malformed RDATA."},
+	{KNOT_ZCOMPILE_ESOA, "Multiple SOA records."},
+	{KNOT_ZCOMPILE_EBADSOA, "SOA record has different owner "
+	 "than in config - parser will not continue!"},
+	{KNOT_ZCOMPILE_EBADNODE, "Error handling node."},
+	{KNOT_ZCOMPILE_EZONEINVAL, "Invalid zone file."},
+	{KNOT_ZCOMPILE_EPARSEFAIL, "Parser failed."},
+	{KNOT_ZCOMPILE_ENOIPV6, "IPv6 support disabled."},
+	{KNOT_ZCOMPILE_ESYNT, "Parser syntactic error."},
+	{KNOT_ZCOMPILE_ERROR, 0}
+};

src/zcompile/zcompile-error.h

@@ -12,6 +12,7 @@
 
 #ifndef _KNOT_ZCOMPILE_ERROR_H_
 #define _KNOT_ZCOMPILE_ERROR_H_
+
 #include "common/errors.h"
 
 /*!
@@ -50,51 +51,23 @@ enum knot_zcompile_error {
 
 	/* Custom error codes. */
 	KNOT_ZCOMPILE_ERROR = -16384, /*!< \brief Generic error. */
-	KNOT_ZCOMPILE_ESYNT,
-	KNOT_ZCOMPILE_EBADNODE,
-	KNOT_ZCOMPILE_EBRDATA,
-	KNOT_ZCOMPILE_EBADSOA,
-	KNOT_ZCOMPILE_ESOA,
+	KNOT_ZCOMPILE_ESYNT, /*!< \brief Syntax error. */
+	KNOT_ZCOMPILE_EBADNODE, /*!< \brief Node error. */
+	KNOT_ZCOMPILE_EBRDATA, /*!< \brief RDATA error. */
+	KNOT_ZCOMPILE_EBADSOA, /*!< \brief SOA owner error. */
+	KNOT_ZCOMPILE_ESOA, /*!< \brief Multiple SOA records. */
 
 	KNOT_ZCOMPILE_EZONEINVAL, /*!< \brief Invalid zone file. */
 	KNOT_ZCOMPILE_EPARSEFAIL, /*!< \brief Parser fail. */
-	KNOT_ZCOMPILE_ENOIPV6 /*! \brief No IPv6 support. */
+	KNOT_ZCOMPILE_ENOIPV6, /*! \brief No IPv6 support. */
+
+	KNOT_ZCOMPILE_ERROR_COUNT = 22
 };
 
 typedef enum knot_zcompile_error knot_zcompile_error_t;
 
 /*! \brief Table linking error messages to error codes. */
-static const error_table_t knot_zcompile_error_msgs[] = {
-
-	/* Mapped errors. */
-	{KNOT_ZCOMPILE_EOK, "OK"},
-	{KNOT_ZCOMPILE_ENOMEM, "Not enough memory."},
-	{KNOT_ZCOMPILE_EINVAL, "Invalid parameter passed."},
-	{KNOT_ZCOMPILE_ENOTSUP, "Parameter not supported."},
-	{KNOT_ZCOMPILE_EBUSY, "Requested resource is busy."},
-	{KNOT_ZCOMPILE_EAGAIN,
-	 "The system lacked the necessary resource, try again."},
-	{KNOT_ZCOMPILE_EACCES,
-	 "Permission to perform requested operation is denied."},
-	{KNOT_ZCOMPILE_ECONNREFUSED, "Connection is refused."},
-	{KNOT_ZCOMPILE_EISCONN, "Already connected."},
-	{KNOT_ZCOMPILE_EADDRINUSE, "Address already in use."},
-	{KNOT_ZCOMPILE_ENOENT, "Resource not found."},
-	{KNOT_ZCOMPILE_ERANGE, "Value is out of range."},
-
-	/* Custom errors. */
-	{KNOT_ZCOMPILE_ERROR, "Generic error."},
-	{KNOT_ZCOMPILE_EBRDATA, "Malformed RDATA."},
-	{KNOT_ZCOMPILE_ESOA, "Multiple SOA records."},
-	{KNOT_ZCOMPILE_EBADSOA, "SOA record has different owner "
-	 "than in config - parser will not continue!"},
-	{KNOT_ZCOMPILE_EBADNODE, "Error handling node."},
-	{KNOT_ZCOMPILE_EZONEINVAL, "Invalid zone file."},
-	{KNOT_ZCOMPILE_EPARSEFAIL, "Parser failed."},
-	{KNOT_ZCOMPILE_ENOIPV6, "IPv6 support disabled."},
-	{KNOT_ZCOMPILE_ESYNT, "Parser syntactic error."},
-	{KNOT_ZCOMPILE_ERROR, 0}
-};
+const error_table_t knot_zcompile_error_msgs[KNOT_ZCOMPILE_ERROR_COUNT];
 
 #endif /* _KNOT_ZCOMPILE_ERROR_H_ */
 

src/zcompile/zparser.y

@@ -27,7 +27,6 @@
 #include "zcompile/zcompile.h"
 #include "zcompile/parser-descriptor.h"
 #include "zcompile/zcompile-error.h"
-#include "common/errors.h"
 
 /* these need to be global, otherwise they cannot be used inside yacc */
 zparser_type *parser;