From f0d7dcfeaafa01126d086e61b97d5330c73b8536 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 3 Oct 2010 14:26:08 +0200 Subject: src: fix warning in compilation This warning has been there for quite some time, fix it by relaxing the const type checking. callback.c: In function `__expect_callback': callback.c:30: warning: passing argument 2 of `__parse_expect' from incompatible pointer type ../../include/internal/prototypes.h:32: note: expected `const struct nfattr **' but argument is of type `struct nfattr **' Signed-off-by: Pablo Neira Ayuso --- include/internal/prototypes.h | 4 ++-- src/conntrack/parse.c | 2 +- src/expect/parse.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/internal/prototypes.h b/include/internal/prototypes.h index bab9082..359a80e 100644 --- a/include/internal/prototypes.h +++ b/include/internal/prototypes.h @@ -7,7 +7,7 @@ int __build_conntrack(struct nfnl_subsys_handle *ssh, struct nfnlhdr *req, size_t size, u_int16_t type, u_int16_t flags, const struct nf_conntrack *ct); void __build_tuple(struct nfnlhdr *req, size_t size, const struct __nfct_tuple *t, const int type); int __parse_message_type(const struct nlmsghdr *nlh); -void __parse_conntrack(const struct nlmsghdr *nlh, const struct nfattr *cda[], struct nf_conntrack *ct); +void __parse_conntrack(const struct nlmsghdr *nlh, struct nfattr *cda[], struct nf_conntrack *ct); void __parse_tuple(const struct nfattr *attr, struct __nfct_tuple *tuple, int dir, u_int32_t *set); int __snprintf_conntrack(char *buf, unsigned int len, const struct nf_conntrack *ct, unsigned int type, unsigned int msg_output, unsigned int flags); int __snprintf_address(char *buf, unsigned int len, const struct __nfct_tuple *tuple); @@ -29,7 +29,7 @@ int __setup_netlink_socket_filter(int fd, struct nfct_filter *filter); */ int __build_expect(struct nfnl_subsys_handle *ssh, struct nfnlhdr *req, size_t size, u_int16_t type, u_int16_t flags, const struct nf_expect *exp); int __parse_expect_message_type(const struct nlmsghdr *nlh); -void __parse_expect(const struct nlmsghdr *nlh, const struct nfattr *cda[], struct nf_expect *exp); +void __parse_expect(const struct nlmsghdr *nlh, struct nfattr *cda[], struct nf_expect *exp); int __expect_callback(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); int __snprintf_expect(char *buf, unsigned int len, const struct nf_expect *exp, unsigned int type, unsigned int msg_output, unsigned int flags); int __snprintf_expect_default(char *buf, unsigned int len, const struct nf_expect *exp, unsigned int msg_type, unsigned int flags); diff --git a/src/conntrack/parse.c b/src/conntrack/parse.c index b7fe0f6..d03ddb3 100644 --- a/src/conntrack/parse.c +++ b/src/conntrack/parse.c @@ -440,7 +440,7 @@ int __parse_message_type(const struct nlmsghdr *nlh) } void __parse_conntrack(const struct nlmsghdr *nlh, - const struct nfattr *cda[], + struct nfattr *cda[], struct nf_conntrack *ct) { struct nfgenmsg *nfhdr = NLMSG_DATA(nlh); diff --git a/src/expect/parse.c b/src/expect/parse.c index e14890d..fb7a021 100644 --- a/src/expect/parse.c +++ b/src/expect/parse.c @@ -25,7 +25,7 @@ int __parse_expect_message_type(const struct nlmsghdr *nlh) } void __parse_expect(const struct nlmsghdr *nlh, - const struct nfattr *cda[], + struct nfattr *cda[], struct nf_expect *exp) { struct nfgenmsg *nfhdr = NLMSG_DATA(nlh); -- cgit v1.2.3