From e87d2f9ef8a4a298de5514b30ec2d43d3c90a644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Neira=20Ayuso?= <alvaroneay@gmail.com>
Date: Mon, 6 Jan 2014 00:51:14 +0100
Subject: src: new error reporting approach for XML/JSON parsers

I have added a new structure for reporting some errors in parser
that we can't cover with errno.

In this patch, we have three errors that we can't cover with errno:

NFT_PARSE_EBADINPUT : Bad XML/JSON format in the input
NFT_PARSE_EMISSINGNODE : Missing node in our input
NFT_PARSE_EBADTYPE : Wrong type value in a node

Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 83ab658..fc13e46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ lib_LTLIBRARIES = libnftables.la
 libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS}
 libnftables_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftables.map \
 			 -version-info $(LIBVERSION)
+
 libnftables_la_SOURCES = utils.c		\
 			 common.c		\
 			 table.c		\
-- 
cgit v1.2.3


From 59e949294f4688bafe44b7def2972987224520c8 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 20 Jan 2014 10:26:57 +0100
Subject: rename library to libnftnl

We plan to use this library name for the higher layer library.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/Makefile.am | 74 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index fc13e46..450279f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,40 +1,40 @@
 include $(top_srcdir)/Make_global.am
-lib_LTLIBRARIES = libnftables.la
+lib_LTLIBRARIES = libnftnl.la
 
-libnftables_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS}
-libnftables_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftables.map \
-			 -version-info $(LIBVERSION)
+libnftnl_la_LIBADD = ${LIBMNL_LIBS} ${LIBXML_LIBS} ${LIBJSON_LIBS}
+libnftnl_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnftnl.map	\
+		      -version-info $(LIBVERSION)
 
-libnftables_la_SOURCES = utils.c		\
-			 common.c		\
-			 table.c		\
-			 chain.c		\
-			 rule.c			\
-			 set.c			\
-			 set_elem.c		\
-			 ruleset.c		\
-			 mxml.c			\
-			 jansson.c		\
-			 expr.c			\
-			 expr_ops.c		\
-			 expr/bitwise.c		\
-			 expr/byteorder.c	\
-			 expr/cmp.c		\
-			 expr/counter.c		\
-			 expr/ct.c		\
-			 expr/data_reg.c	\
-			 expr/exthdr.c		\
-			 expr/limit.c		\
-			 expr/log.c		\
-			 expr/lookup.c		\
-			 expr/immediate.c	\
-			 expr/match.c		\
-			 expr/meta.c		\
-			 expr/nat.c		\
-			 expr/payload.c		\
-			 expr/reject.c		\
-			 expr/target.c		\
-			 expr/data_reg.h	\
-			 libnftables.map	\
-			 expr_ops.h		\
-			 internal.h
+libnftnl_la_SOURCES = utils.c		\
+		      common.c		\
+		      table.c		\
+		      chain.c		\
+		      rule.c		\
+		      set.c		\
+		      set_elem.c	\
+		      ruleset.c		\
+		      mxml.c		\
+		      jansson.c		\
+		      expr.c		\
+		      expr_ops.c	\
+		      expr/bitwise.c	\
+		      expr/byteorder.c	\
+		      expr/cmp.c	\
+		      expr/counter.c	\
+		      expr/ct.c		\
+		      expr/data_reg.c	\
+		      expr/exthdr.c	\
+		      expr/limit.c	\
+		      expr/log.c	\
+		      expr/lookup.c	\
+		      expr/immediate.c	\
+		      expr/match.c	\
+		      expr/meta.c	\
+		      expr/nat.c	\
+		      expr/payload.c	\
+		      expr/reject.c	\
+		      expr/target.c	\
+		      expr/data_reg.h	\
+		      libnftnl.map	\
+		      expr_ops.h	\
+		      internal.h
-- 
cgit v1.2.3