Merge changes.

Knot.files

@@ -93,6 +93,8 @@ src/common/evsched.c
 src/common/evsched.h
 src/common/errors.h
 src/common/errors.c
+src/common/errcode.h
+src/common/errcode.c
 src/common/acl.c
 src/common/acl.h
 src/common/sockaddr.h

src/Makefile.am

@@ -59,13 +59,11 @@ knot_zcompile_SOURCES =				\
 	common/descriptor_new.h			\
 	common/descriptor_new.c			\
 	common/lists.c				\
-	common/base32.c				\
 	common/base64.c				\
 	common/base64.h				\
 	common/lists.h				\
 	common/heap.h				\
 	common/heap.c				\
-	common/base32.h				\
 	common/print.c				\
 	common/print.h				\
 	common/skip-list.c			\

src/common/errcode.h

@@ -83,7 +83,7 @@ enum knot_error {
 	KNOT_EIXFRSPACE,      /*!< IXFR reply did not fit in. */
 	KNOT_ECNAME,          /*!< CNAME loop found in zone. */
 	KNOT_ENODIFF,         /*!< No zone diff can be created. */
-	KNOT_EDSDIGESTLEN     /*!< DS digest length does not match digest type. */
+	KNOT_EDSDIGESTLEN,    /*!< DS digest length does not match digest type. */
 
 	/* Zone file loader errors. */
 	FLOADER_EFSTAT,