diff options
| author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2007-12-09 17:51:14 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2007-12-09 17:51:14 +0000 |
| commit | f582da9e392ebffa07f209f9e3d362e65ec39818 (patch) | |
| tree | ab553c00599de51924de646d66e88cb9613b90f2 | |
| parent | 6ffe4d11e701cf080302d133864cef0980f4d85b (diff) | |
fix several compilation warnings (reported by J.Engelhardt)
| -rw-r--r-- | include/internal.h | 3 | ||||
| -rw-r--r-- | src/conntrack/objopt.c | 2 | ||||
| -rw-r--r-- | src/expect/build.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/internal.h b/include/internal.h index 1cda181..0e7d9ae 100644 --- a/include/internal.h +++ b/include/internal.h @@ -178,6 +178,7 @@ void __parse_tuple(const struct nfattr *attr, struct __nfct_tuple *tuple, int di 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); int __snprintf_protocol(char *buf, unsigned int len, const struct nf_conntrack *ct); +int __snprintf_proto(char *buf, unsigned int len, const struct __nfct_tuple *tuple); int __snprintf_conntrack_default(char *buf, unsigned int len, const struct nf_conntrack *ct, const unsigned int msg_type, const unsigned int flags); int __snprintf_conntrack_xml(char *buf, unsigned int len, const struct nf_conntrack *ct, const unsigned int msg_type, const unsigned int flags); @@ -198,5 +199,7 @@ int __build_expect(struct nfnl_subsys_handle *ssh, struct nfnlhdr *req, size_t s int __parse_expect_message_type(const struct nlmsghdr *nlh); void __parse_expect(const struct nlmsghdr *nlh, const 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); #endif diff --git a/src/conntrack/objopt.c b/src/conntrack/objopt.c index 2f00005..1a058fe 100644 --- a/src/conntrack/objopt.c +++ b/src/conntrack/objopt.c @@ -7,7 +7,7 @@ #include "internal.h" -static int __autocomplete(struct nf_conntrack *ct, int dir) +static void __autocomplete(struct nf_conntrack *ct, int dir) { int other = (dir == __DIR_ORIG) ? __DIR_REPL : __DIR_ORIG; diff --git a/src/expect/build.c b/src/expect/build.c index 0415621..dfc5edf 100644 --- a/src/expect/build.c +++ b/src/expect/build.c @@ -27,6 +27,8 @@ int __build_expect(struct nfnl_subsys_handle *ssh, l3num = exp->master.tuple[NFCT_DIR_ORIGINAL].l3protonum; else if (test_bit(ATTR_ORIG_L3PROTO, exp->expected.set)) l3num = exp->expected.tuple[NFCT_DIR_ORIGINAL].l3protonum; + else + return -1; memset(req, 0, size); |