libnetfilter_conntrack: build improvements

libnetfilter_conntrack: build improvements

[Jan Engelhardt]

The following changes since commit e6ba25eb57957e6634d5e7cec539b1d6e4204b27:

  Merge branch 'master' of git://dev.medozas.de/libnetfilter_conntrack (2010-12-21 20:25:32 +0100)

are available in the git repository at:

  git://dev.medozas.de/libnetfilter_conntrack master

Jan Engelhardt (4):
      build: remove unused LIBTOOL_DEPS
      build: use -Wall across the entire source
      utils: resolve compiler warnings
      qa: resolve compiler warnings

 Make_global.am                  |    1 +
 configure.ac                    |    2 --
 qa/test_api.c                   |    9 +++++----
 qa/test_filter.c                |    6 +++++-
 src/Makefile.am                 |    2 --
 src/conntrack/Makefile.am       |    2 --
 src/expect/Makefile.am          |    2 --
 utils/conntrack_create.c        |    4 +++-
 utils/conntrack_create_nat.c    |    4 +++-
 utils/conntrack_delete.c        |    4 +++-
 utils/conntrack_dump.c          |    4 ++--
 utils/conntrack_events.c        |    6 ++----
 utils/conntrack_filter.c        |    7 +++----
 utils/conntrack_flush.c         |    4 ++--
 utils/conntrack_get.c           |    4 +++-
 utils/conntrack_grp_create.c    |    4 +++-
 utils/conntrack_master.c        |    4 +++-
 utils/conntrack_update.c        |    4 +++-
 utils/ctexp_events.c            |    1 +
 utils/expect_create.c           |    4 +++-
 utils/expect_create_userspace.c |    4 +++-
 utils/expect_delete.c           |    4 +++-
 utils/expect_dump.c             |    3 ++-
 utils/expect_events.c           |    3 ++-
 utils/expect_flush.c            |    3 ++-
 utils/expect_get.c              |    4 +++-
 26 files changed, 60 insertions(+), 39 deletions(-)

[PATCH 1/4] build: remove unused LIBTOOL_DEPS

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 configure.ac |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b194ea8..e7c1367 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,6 @@ AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
-AC_SUBST(LIBTOOL_DEPS)
-
 case "$host" in 
 *-*-linux*) ;;
 *) AC_MSG_ERROR([Linux only, dude!]);;
-- 
1.7.1

[PATCH 2/4] build: use -Wall across the entire source

[Jan Engelhardt]

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 Make_global.am            |    1 +
 src/Makefile.am           |    2 --
 src/conntrack/Makefile.am |    2 --
 src/expect/Makefile.am    |    2 --
 4 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/Make_global.am b/Make_global.am
index 955a626..00bde49 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -5,3 +5,4 @@
 LIBVERSION=3:2:0
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
diff --git a/src/Makefile.am b/src/Makefile.am
index 82030c4..a6d3343 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,8 +6,6 @@ include $(top_srcdir)/Make_global.am
 
 SUBDIRS=conntrack expect
 
-AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
-
 lib_LTLIBRARIES = libnetfilter_conntrack.la 
 
 libnetfilter_conntrack_la_LIBADD = conntrack/libnfconntrack.la \
diff --git a/src/conntrack/Makefile.am b/src/conntrack/Makefile.am
index 34afefb..fb6b048 100644
--- a/src/conntrack/Makefile.am
+++ b/src/conntrack/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/Make_global.am
 
-AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
-
 noinst_LTLIBRARIES = libnfconntrack.la 
 
 libnfconntrack_la_SOURCES = api.c \
diff --git a/src/expect/Makefile.am b/src/expect/Makefile.am
index 380befa..8adf740 100644
--- a/src/expect/Makefile.am
+++ b/src/expect/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/Make_global.am
 
-AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
-
 noinst_LTLIBRARIES = libnfexpect.la 
 
 libnfexpect_la_SOURCES = api.c \
-- 
1.7.1

[PATCH 3/4] utils: resolve compiler warnings

[Jan Engelhardt]

The addition of -Wall flagged some legitimate warnings:

make  expect_dump expect_create expect_get expect_delete expect_flush expect_events expect_create_userspace conntrack_create conntrack_dump conntrack_update conntrack_delete conntrack_flush conntrack_create_nat conntrack_get conntrack_events conntrack_master conntrack_filter conntrack_grp_create ctexp_events
make[1]: Entering directory `/home/jengelh/code/libnetfilter_conntrack/utils'
  CC     expect_dump.o
expect_dump.c: In function "main":
expect_dump.c:36:3: warning: implicit declaration of function "strerror"
expect_dump.c:36:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   expect_dump
  CC     expect_create.o
expect_create.c: In function "main":
expect_create.c:31:2: warning: implicit declaration of function "inet_addr"
expect_create.c:54:3: warning: implicit declaration of function "strerror"
expect_create.c:54:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
expect_create.c:117:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   expect_create
  CC     expect_get.o
expect_get.c: In function "main":
expect_get.c:33:2: warning: implicit declaration of function "inet_addr"
expect_get.c:59:3: warning: implicit declaration of function "strerror"
expect_get.c:59:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   expect_get
  CC     expect_delete.o
expect_delete.c: In function "main":
expect_delete.c:21:2: warning: implicit declaration of function "inet_addr"
expect_delete.c:46:3: warning: implicit declaration of function "strerror"
expect_delete.c:46:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   expect_delete
  CC     expect_flush.o
expect_flush.c: In function "main":
expect_flush.c:23:3: warning: implicit declaration of function "strerror"
expect_flush.c:23:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   expect_flush
  CC     expect_events.o
expect_events.c: In function "main":
expect_events.c:44:3: warning: implicit declaration of function "strerror"
expect_events.c:44:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   expect_events
  CC     expect_create_userspace.o
expect_create_userspace.c: In function "main":
expect_create_userspace.c:31:2: warning: implicit declaration of function "inet_addr"
expect_create_userspace.c:58:3: warning: implicit declaration of function "strerror"
expect_create_userspace.c:58:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
expect_create_userspace.c:121:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   expect_create_userspace
  CC     conntrack_create.o
conntrack_create.c: In function "main":
conntrack_create.c:21:2: warning: implicit declaration of function "inet_addr"
conntrack_create.c:43:3: warning: implicit declaration of function "strerror"
conntrack_create.c:43:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   conntrack_create
  CC     conntrack_dump.o
conntrack_dump.c: In function "main":
conntrack_dump.c:37:3: warning: implicit declaration of function "strerror"
conntrack_dump.c:37:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_dump.c:24:7: warning: unused variable "buf"
  CCLD   conntrack_dump
  CC     conntrack_update.o
conntrack_update.c: In function "main":
conntrack_update.c:21:2: warning: implicit declaration of function "inet_addr"
conntrack_update.c:43:3: warning: implicit declaration of function "strerror"
conntrack_update.c:43:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   conntrack_update
  CC     conntrack_delete.o
conntrack_delete.c: In function "main":
conntrack_delete.c:21:2: warning: implicit declaration of function "inet_addr"
conntrack_delete.c:38:3: warning: implicit declaration of function "strerror"
conntrack_delete.c:38:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   conntrack_delete
  CC     conntrack_flush.o
conntrack_flush.c: In function "main":
conntrack_flush.c:24:3: warning: implicit declaration of function "strerror"
conntrack_flush.c:24:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_flush.c:12:7: warning: unused variable "buf"
  CCLD   conntrack_flush
  CC     conntrack_create_nat.o
conntrack_create_nat.c: In function "main":
conntrack_create_nat.c:21:2: warning: implicit declaration of function "inet_addr"
conntrack_create_nat.c:45:3: warning: implicit declaration of function "strerror"
conntrack_create_nat.c:45:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   conntrack_create_nat
  CC     conntrack_get.o
conntrack_get.c: In function "main":
conntrack_get.c:33:2: warning: implicit declaration of function "inet_addr"
conntrack_get.c:52:3: warning: implicit declaration of function "strerror"
conntrack_get.c:52:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   conntrack_get
  CC     conntrack_events.o
conntrack_events.c: In function "main":
conntrack_events.c:45:3: warning: implicit declaration of function "strerror"
conntrack_events.c:45:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_events.c:29:7: warning: unused variable "buf"
conntrack_events.c:28:23: warning: unused variable "ct"
conntrack_events.c:26:11: warning: unused variable "family"
  CCLD   conntrack_events
  CC     conntrack_master.o
conntrack_master.c: In function "main":
conntrack_master.c:22:2: warning: implicit declaration of function "inet_addr"
conntrack_master.c:44:3: warning: implicit declaration of function "strerror"
conntrack_master.c:44:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_master.c:86:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   conntrack_master
  CC     conntrack_filter.o
conntrack_filter.c: In function "main":
conntrack_filter.c:58:3: warning: implicit declaration of function "inet_addr"
conntrack_filter.c:98:3: warning: implicit declaration of function "strerror"
conntrack_filter.c:98:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
conntrack_filter.c:31:7: warning: unused variable "buf"
conntrack_filter.c:30:23: warning: unused variable "ct"
conntrack_filter.c:27:11: warning: unused variable "family"
  CCLD   conntrack_filter
  CC     conntrack_grp_create.o
conntrack_grp_create.c: In function "main":
conntrack_grp_create.c:21:3: warning: implicit declaration of function "inet_addr"
conntrack_grp_create.c:49:3: warning: implicit declaration of function "strerror"
conntrack_grp_create.c:49:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   conntrack_grp_create
  CC     ctexp_events.o
ctexp_events.c: In function "main":
ctexp_events.c:63:3: warning: implicit declaration of function "strerror"
ctexp_events.c:63:3: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
  CCLD   ctexp_events
make[1]: Leaving directory `/home/jengelh/code/libnetfilter_conntrack/utils'

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 utils/conntrack_create.c        |    4 +++-
 utils/conntrack_create_nat.c    |    4 +++-
 utils/conntrack_delete.c        |    4 +++-
 utils/conntrack_dump.c          |    4 ++--
 utils/conntrack_events.c        |    6 ++----
 utils/conntrack_filter.c        |    7 +++----
 utils/conntrack_flush.c         |    4 ++--
 utils/conntrack_get.c           |    4 +++-
 utils/conntrack_grp_create.c    |    4 +++-
 utils/conntrack_master.c        |    4 +++-
 utils/conntrack_update.c        |    4 +++-
 utils/ctexp_events.c            |    1 +
 utils/expect_create.c           |    4 +++-
 utils/expect_create_userspace.c |    4 +++-
 utils/expect_delete.c           |    4 +++-
 utils/expect_dump.c             |    3 ++-
 utils/expect_events.c           |    3 ++-
 utils/expect_flush.c            |    3 ++-
 utils/expect_get.c              |    4 +++-
 19 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/utils/conntrack_create.c b/utils/conntrack_create.c
index a168d2c..7140b97 100644
--- a/utils/conntrack_create.c
+++ b/utils/conntrack_create.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_create_nat.c b/utils/conntrack_create_nat.c
index 3cc65df..f7426ee 100644
--- a/utils/conntrack_create_nat.c
+++ b/utils/conntrack_create_nat.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_delete.c b/utils/conntrack_delete.c
index 227319f..b3204dd 100644
--- a/utils/conntrack_delete.c
+++ b/utils/conntrack_delete.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_dump.c b/utils/conntrack_dump.c
index a15acc1..a36e753 100644
--- a/utils/conntrack_dump.c
+++ b/utils/conntrack_dump.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
@@ -16,12 +17,11 @@ static int cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	u_int32_t family = AF_INET;
 	struct nfct_handle *h;
-	char buf[1024];
 
 	h = nfct_open(CONNTRACK, 0);
 	if (!h) {
diff --git a/utils/conntrack_events.c b/utils/conntrack_events.c
index 1f115e2..f5e72c7 100644
--- a/utils/conntrack_events.c
+++ b/utils/conntrack_events.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
@@ -20,13 +21,10 @@ static int event_cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
-	u_int8_t family = AF_INET;
 	struct nfct_handle *h;
-	struct nf_conntrack *ct;
-	char buf[1024];
 
 	h = nfct_open(CONNTRACK, NFCT_ALL_CT_GROUPS);
 	if (!h) {
diff --git a/utils/conntrack_filter.c b/utils/conntrack_filter.c
index b05c37c..a3eeebc 100644
--- a/utils/conntrack_filter.c
+++ b/utils/conntrack_filter.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
@@ -21,14 +23,11 @@ static int event_cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
-	u_int8_t family = AF_INET;
 	struct nfct_handle *h;
 	struct nfct_filter *filter;
-	struct nf_conntrack *ct;
-	char buf[1024];
 
 	h = nfct_open(CONNTRACK, NF_NETLINK_CONNTRACK_NEW | 
 				 NF_NETLINK_CONNTRACK_UPDATE);
diff --git a/utils/conntrack_flush.c b/utils/conntrack_flush.c
index 92aac86..36437e2 100644
--- a/utils/conntrack_flush.c
+++ b/utils/conntrack_flush.c
@@ -1,15 +1,15 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	u_int8_t family = AF_INET;
 	struct nfct_handle *h;
-	char buf[1024];
 
 	h = nfct_open(CONNTRACK, 0);
 	if (!h) {
diff --git a/utils/conntrack_get.c b/utils/conntrack_get.c
index 33c836b..7d7badd 100644
--- a/utils/conntrack_get.c
+++ b/utils/conntrack_get.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
@@ -17,7 +19,7 @@ static int cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_grp_create.c b/utils/conntrack_grp_create.c
index b77d155..b47d09a 100644
--- a/utils/conntrack_grp_create.c
+++ b/utils/conntrack_grp_create.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_master.c b/utils/conntrack_master.c
index d1552a4..d08219a 100644
--- a/utils/conntrack_master.c
+++ b/utils/conntrack_master.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_update.c b/utils/conntrack_update.c
index 0256b7a..24545ca 100644
--- a/utils/conntrack_update.c
+++ b/utils/conntrack_update.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/ctexp_events.c b/utils/ctexp_events.c
index ec459e4..c53d026 100644
--- a/utils/ctexp_events.c
+++ b/utils/ctexp_events.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
diff --git a/utils/expect_create.c b/utils/expect_create.c
index 9e3c7fb..912ab8e 100644
--- a/utils/expect_create.c
+++ b/utils/expect_create.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
@@ -10,7 +12,7 @@
  * Therefore, make sure you have load nf_conntrack_ftp before executing it. 
  */
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/expect_create_userspace.c b/utils/expect_create_userspace.c
index 67e7b2a..0e910e6 100644
--- a/utils/expect_create_userspace.c
+++ b/utils/expect_create_userspace.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
@@ -10,7 +12,7 @@
  * a Linux kernel >= 2.6.37.
  */
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/expect_delete.c b/utils/expect_delete.c
index d6b56f1..18f4a79 100644
--- a/utils/expect_delete.c
+++ b/utils/expect_delete.c
@@ -1,10 +1,12 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/expect_dump.c b/utils/expect_dump.c
index fa25bad..b227e1a 100644
--- a/utils/expect_dump.c
+++ b/utils/expect_dump.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
@@ -16,7 +17,7 @@ static int cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	u_int8_t family = AF_INET;
diff --git a/utils/expect_events.c b/utils/expect_events.c
index 89426f4..8adacb6 100644
--- a/utils/expect_events.c
+++ b/utils/expect_events.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
@@ -20,7 +21,7 @@ static int event_cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/expect_flush.c b/utils/expect_flush.c
index 4e28c1c..1ae69c9 100644
--- a/utils/expect_flush.c
+++ b/utils/expect_flush.c
@@ -1,10 +1,11 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	u_int8_t family = AF_INET;
diff --git a/utils/expect_get.c b/utils/expect_get.c
index cda5a3b..fc7e116 100644
--- a/utils/expect_get.c
+++ b/utils/expect_get.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
@@ -16,7 +18,7 @@ static int cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 4/4] qa: resolve compiler warnings

[Jan Engelhardt]

-Wall flags this:

make  test_api test_filter
make[1]: Entering directory `/home/jengelh/code/libnetfilter_conntrack/qa'
  CC     test_api.o
test_api.c:16:8: warning: return type defaults to "int"
test_api.c: In function "eval_sigterm":
test_api.c:23:18: warning: too many arguments for format
test_api.c: In function "main":
test_api.c:55:2: warning: implicit declaration of function "fork"
test_api.c:34:22: warning: unused variable "h"
test_api.c:102:1: warning: control reaches end of non-void function
test_api.c: In function "eval_sigterm":
test_api.c:29:1: warning: control reaches end of non-void function
  CCLD   test_api
  CC     test_filter.o
test_filter.c: In function "main":
test_filter.c:58:4: warning: implicit declaration of function "inet_addr"
test_filter.c:74:2: warning: implicit declaration of function "strerror"
test_filter.c:74:2: warning: format "%s" expects type ‘char *’, but argument 3 has type ‘int’
test_filter.c:75:1: warning: control reaches end of non-void function
  CCLD   test_filter

make[1]: Leaving directory `/home/jengelh/code/libnetfilter_conntrack/qa'

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 qa/test_api.c    |    9 +++++----
 qa/test_filter.c |    6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/qa/test_api.c b/qa/test_api.c
index eda9d49..e7a8453 100644
--- a/qa/test_api.c
+++ b/qa/test_api.c
@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <sys/wait.h>
 #include <errno.h>
 
@@ -13,14 +14,14 @@
  * this file contains a test to check the set/get/copy/cmp APIs.
  */
 
-static eval_sigterm(int status)
+static void eval_sigterm(int status)
 {
 	switch(WTERMSIG(status)) {
 	case SIGSEGV:
 		printf("received SIGSEV\n");
 		break;
 	case 0:
-		printf("OK\n", WTERMSIG(status));
+		printf("OK\n");
 		break;
 	default:
 		printf("exited with signal: %d\n", WTERMSIG(status));
@@ -28,10 +29,9 @@ static eval_sigterm(int status)
 	}
 }
 
-int main()
+int main(void)
 {
 	int ret, i;
-	struct nfct_handle *h;
 	struct nf_conntrack *ct, *tmp;
 	char data[32];
 	int status;
@@ -99,4 +99,5 @@ int main()
 
 	nfct_destroy(ct);
 	nfct_destroy(tmp);
+	return EXIT_SUCCESS;
 }
diff --git a/qa/test_filter.c b/qa/test_filter.c
index 35fdbec..7877819 100644
--- a/qa/test_filter.c
+++ b/qa/test_filter.c
@@ -3,6 +3,9 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <arpa/inet.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
@@ -23,7 +26,7 @@ static int event_cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int i, ret;
 	struct nfct_handle *h;
@@ -72,4 +75,5 @@ int main()
 
 	ret = nfct_catch(h);
 	printf("test ret=%d (%s)\n", ret, strerror(errno));
+	return EXIT_SUCCESS;
 }
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: libnetfilter_conntrack: build improvements

[Pablo Neira Ayuso]

On 31/12/10 00:41, Jan Engelhardt wrote:
> The following changes since commit e6ba25eb57957e6634d5e7cec539b1d6e4204b27:
> 
>   Merge branch 'master' of git://dev.medozas.de/libnetfilter_conntrack (2010-12-21 20:25:32 +0100)
> 
> are available in the git repository at:
> 
>   git://dev.medozas.de/libnetfilter_conntrack master
> 
> Jan Engelhardt (4):
>       build: remove unused LIBTOOL_DEPS
>       build: use -Wall across the entire source
>       utils: resolve compiler warnings
>       qa: resolve compiler warnings
> 
>  Make_global.am                  |    1 +
>  configure.ac                    |    2 --
>  qa/test_api.c                   |    9 +++++----
>  qa/test_filter.c                |    6 +++++-
>  src/Makefile.am                 |    2 --
>  src/conntrack/Makefile.am       |    2 --
>  src/expect/Makefile.am          |    2 --
>  utils/conntrack_create.c        |    4 +++-
>  utils/conntrack_create_nat.c    |    4 +++-
>  utils/conntrack_delete.c        |    4 +++-
>  utils/conntrack_dump.c          |    4 ++--
>  utils/conntrack_events.c        |    6 ++----
>  utils/conntrack_filter.c        |    7 +++----
>  utils/conntrack_flush.c         |    4 ++--
>  utils/conntrack_get.c           |    4 +++-
>  utils/conntrack_grp_create.c    |    4 +++-
>  utils/conntrack_master.c        |    4 +++-
>  utils/conntrack_update.c        |    4 +++-
>  utils/ctexp_events.c            |    1 +
>  utils/expect_create.c           |    4 +++-
>  utils/expect_create_userspace.c |    4 +++-
>  utils/expect_delete.c           |    4 +++-
>  utils/expect_dump.c             |    3 ++-
>  utils/expect_events.c           |    3 ++-
>  utils/expect_flush.c            |    3 ++-
>  utils/expect_get.c              |    4 +++-
>  26 files changed, 60 insertions(+), 39 deletions(-)

also applied, thanks again jan.