* libnetfilter_log: build improvements
@ 2010-12-30 23:42 Jan Engelhardt
2010-12-30 23:42 ` [PATCH 1/4] build: remove unused LIBTOOL_DEPS Jan Engelhardt
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Jan Engelhardt @ 2010-12-30 23:42 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
The following changes since commit 9ce233ad4377b609ecb8d3bb84036bb629f7b291:
src: declare non-modified data as const (2010-12-21 20:54:42 +0100)
are available in the git repository at:
git://dev.medozas.de/libnetfilter_log master
Jan Engelhardt (4):
build: remove unused LIBTOOL_DEPS
build: create a Make_global.am file
build: use -Wall across the entire source
utils: resolve compiler warnings
Make_global.am | 2 ++
configure.ac | 2 --
src/Makefile.am | 3 +--
utils/Makefile.am | 2 +-
utils/nfulnl_test.c | 4 ++--
utils/ulog_test.c | 4 ++--
6 files changed, 8 insertions(+), 9 deletions(-)
create mode 100644 Make_global.am
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] build: remove unused LIBTOOL_DEPS
2010-12-30 23:42 libnetfilter_log: build improvements Jan Engelhardt
@ 2010-12-30 23:42 ` Jan Engelhardt
2010-12-30 23:42 ` [PATCH 2/4] build: create a Make_global.am file Jan Engelhardt
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2010-12-30 23:42 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
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 4a86fae..8050f96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,8 +13,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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] build: create a Make_global.am file
2010-12-30 23:42 libnetfilter_log: build improvements Jan Engelhardt
2010-12-30 23:42 ` [PATCH 1/4] build: remove unused LIBTOOL_DEPS Jan Engelhardt
@ 2010-12-30 23:42 ` Jan Engelhardt
2010-12-30 23:42 ` [PATCH 3/4] build: use -Wall across the entire source Jan Engelhardt
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2010-12-30 23:42 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Just like the other Netfilter libraries.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Make_global.am | 1 +
src/Makefile.am | 3 ++-
utils/Makefile.am | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 Make_global.am
diff --git a/Make_global.am b/Make_global.am
new file mode 100644
index 0000000..e0fc5fb
--- /dev/null
+++ b/Make_global.am
@@ -0,0 +1 @@
+AM_CPPFLAGS = -I${top_srcdir}/include
diff --git a/src/Makefile.am b/src/Makefile.am
index e78faa8..23f0a07 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,8 @@
#
LIBVERSION=2:0:1
-AM_CPPFLAGS = -I$(top_srcdir)/include
+include ${top_srcdir}/Make_global.am
+
AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
diff --git a/utils/Makefile.am b/utils/Makefile.am
index b6c333b..ae64c90 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+include ${top_srcdir}/Make_global.am
check_PROGRAMS = nfulnl_test ulog_test
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] build: use -Wall across the entire source
2010-12-30 23:42 libnetfilter_log: build improvements Jan Engelhardt
2010-12-30 23:42 ` [PATCH 1/4] build: remove unused LIBTOOL_DEPS Jan Engelhardt
2010-12-30 23:42 ` [PATCH 2/4] build: create a Make_global.am file Jan Engelhardt
@ 2010-12-30 23:42 ` Jan Engelhardt
2010-12-30 23:42 ` [PATCH 4/4] utils: resolve compiler warnings Jan Engelhardt
2011-01-06 2:24 ` libnetfilter_log: build improvements Pablo Neira Ayuso
4 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2010-12-30 23:42 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Make_global.am | 1 +
src/Makefile.am | 2 --
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Make_global.am b/Make_global.am
index e0fc5fb..b7dab7b 100644
--- a/Make_global.am
+++ b/Make_global.am
@@ -1 +1,2 @@
AM_CPPFLAGS = -I${top_srcdir}/include
+AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
diff --git a/src/Makefile.am b/src/Makefile.am
index 23f0a07..10a66e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,6 @@ LIBVERSION=2:0:1
include ${top_srcdir}/Make_global.am
-AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
-
lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] utils: resolve compiler warnings
2010-12-30 23:42 libnetfilter_log: build improvements Jan Engelhardt
` (2 preceding siblings ...)
2010-12-30 23:42 ` [PATCH 3/4] build: use -Wall across the entire source Jan Engelhardt
@ 2010-12-30 23:42 ` Jan Engelhardt
2011-01-06 2:24 ` libnetfilter_log: build improvements Pablo Neira Ayuso
4 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2010-12-30 23:42 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
make nfulnl_test ulog_test
make[1]: Entering directory `/home/jengelh/code/libnetfilter_log/utils'
CC nfulnl_test.o
nfulnl_test.c: In function "cb":
nfulnl_test.c:47:1: warning: no return statement in function returning non-void
nfulnl_test.c: In function "main":
nfulnl_test.c:102:20: warning: unused variable "nlh"
CCLD nfulnl_test
CC ulog_test.o
ulog_test.c: In function "handle_packet":
ulog_test.c:27:9: warning: format "%d" expects type ‘int’, but argument 4 has type ‘size_t’
ulog_test.c: In function "main":
ulog_test.c:79:3: warning: suggest parentheses around assignment used as truth value
CCLD ulog_test
make[1]: Leaving directory `/home/jengelh/code/libnetfilter_log/utils'
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
utils/nfulnl_test.c | 4 ++--
utils/ulog_test.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/utils/nfulnl_test.c b/utils/nfulnl_test.c
index 139013d..ae5da79 100644
--- a/utils/nfulnl_test.c
+++ b/utils/nfulnl_test.c
@@ -44,6 +44,7 @@ static int cb(struct nflog_g_handle *gh, struct nfgenmsg *nfmsg,
struct nflog_data *nfa, void *data)
{
print_pkt(nfa);
+ return 0;
}
@@ -99,7 +100,6 @@ int main(int argc, char **argv)
printf("going into main loop\n");
while ((rv = recv(fd, buf, sizeof(buf), 0)) && rv >= 0) {
- struct nlmsghdr *nlh;
printf("pkt received (len=%u)\n", rv);
/* handle messages in just-received packet */
@@ -121,5 +121,5 @@ int main(int argc, char **argv)
printf("closing handle\n");
nflog_close(h);
- exit(0);
+ return EXIT_SUCCESS;
}
diff --git a/utils/ulog_test.c b/utils/ulog_test.c
index d568aa4..f3adec2 100644
--- a/utils/ulog_test.c
+++ b/utils/ulog_test.c
@@ -23,7 +23,7 @@ void handle_packet(ulog_packet_msg_t *pkt)
unsigned char *p;
int i;
- printf("Hook=%u Mark=%lu len=%d ",
+ printf("Hook=%u Mark=%lu len=%zu ",
pkt->hook, pkt->mark, pkt->data_len);
if (strlen(pkt->prefix))
printf("Prefix=%s ", pkt->prefix);
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
exit(1);
}
printf("%d bytes received\n", len);
- while (upkt = ipulog_get_packet(h, buf, len)) {
+ while ((upkt = ipulog_get_packet(h, buf, len)) != NULL) {
handle_packet(upkt);
}
}
--
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: libnetfilter_log: build improvements
2010-12-30 23:42 libnetfilter_log: build improvements Jan Engelhardt
` (3 preceding siblings ...)
2010-12-30 23:42 ` [PATCH 4/4] utils: resolve compiler warnings Jan Engelhardt
@ 2011-01-06 2:24 ` Pablo Neira Ayuso
4 siblings, 0 replies; 6+ messages in thread
From: Pablo Neira Ayuso @ 2011-01-06 2:24 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: netfilter-devel
On 31/12/10 00:42, Jan Engelhardt wrote:
> The following changes since commit 9ce233ad4377b609ecb8d3bb84036bb629f7b291:
>
> src: declare non-modified data as const (2010-12-21 20:54:42 +0100)
>
> are available in the git repository at:
> git://dev.medozas.de/libnetfilter_log master
>
> Jan Engelhardt (4):
> build: remove unused LIBTOOL_DEPS
> build: create a Make_global.am file
> build: use -Wall across the entire source
> utils: resolve compiler warnings
>
> Make_global.am | 2 ++
> configure.ac | 2 --
> src/Makefile.am | 3 +--
> utils/Makefile.am | 2 +-
> utils/nfulnl_test.c | 4 ++--
> utils/ulog_test.c | 4 ++--
> 6 files changed, 8 insertions(+), 9 deletions(-)
> create mode 100644 Make_global.am
also applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-06 2:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-30 23:42 libnetfilter_log: build improvements Jan Engelhardt
2010-12-30 23:42 ` [PATCH 1/4] build: remove unused LIBTOOL_DEPS Jan Engelhardt
2010-12-30 23:42 ` [PATCH 2/4] build: create a Make_global.am file Jan Engelhardt
2010-12-30 23:42 ` [PATCH 3/4] build: use -Wall across the entire source Jan Engelhardt
2010-12-30 23:42 ` [PATCH 4/4] utils: resolve compiler warnings Jan Engelhardt
2011-01-06 2:24 ` libnetfilter_log: build improvements Pablo Neira Ayuso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.