From: Jan Engelhardt <jengelh@inai.de>
To: pablo@netfilter.org
Cc: netfilter@vger.kernel.org, netfilter-devel@vger.kernel.org,
netfilter-announce@lists.netfilter.org, netdev@vger.kernel.org
Subject: [PATCH 1/2] nfct-extensions/timeout: adjust for changed nfct_timeout_snprintf API
Date: Sat, 26 May 2012 21:02:34 +0200 [thread overview]
Message-ID: <1338058955-5789-2-git-send-email-jengelh@inai.de> (raw)
In-Reply-To: <1338058955-5789-1-git-send-email-jengelh@inai.de>
Despite requiring libnetfilter_cttimeout >= 1.0.0, it did not
use the new API.
nfct-extensions/timeout.c: In function 'nfct_timeout_cb':
nfct-extensions/timeout.c:99:2: error: too few arguments to function
'nfct_timeout_snprintf'
In file included from nfct-extensions/timeout.c:26:0:
/usr/include/libnetfilter_cttimeout-1.0.0/libnetfilter_cttimeout/
libnetfilter_cttimeout.h:114:5: note: declared here
114: int nfct_timeout_snprintf(char *buf, size_t size,
const struct nfct_timeout *, unsigned int type, unsigned int flags);
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
src/nfct-extensions/timeout.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/nfct-extensions/timeout.c b/src/nfct-extensions/timeout.c
index a1a5c52..5b32023 100644
--- a/src/nfct-extensions/timeout.c
+++ b/src/nfct-extensions/timeout.c
@@ -96,7 +96,7 @@ static int nfct_timeout_cb(const struct nlmsghdr *nlh, void *data)
goto err_free;
}
- nfct_timeout_snprintf(buf, sizeof(buf), t, 0);
+ nfct_timeout_snprintf(buf, sizeof(buf), t, NFCT_TIMEOUT_O_DEFAULT, 0);
printf("%s\n", buf);
err_free:
--
1.7.7
next prev parent reply other threads:[~2012-05-26 19:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-26 18:06 [ANNOUNCE] conntrack-tools 1.2.0 release Pablo Neira Ayuso
2012-05-26 19:02 ` Jan Engelhardt
2012-05-26 19:02 ` Jan Engelhardt [this message]
2012-05-26 20:21 ` [PATCH 1/2] nfct-extensions/timeout: adjust for changed nfct_timeout_snprintf API Pablo Neira Ayuso
2012-05-27 2:35 ` spiro
2012-05-26 19:02 ` [PATCH 2/2] Update .gitignore Jan Engelhardt
2012-05-26 20:19 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338058955-5789-2-git-send-email-jengelh@inai.de \
--to=jengelh@inai.de \
--cc=netdev@vger.kernel.org \
--cc=netfilter-announce@lists.netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=netfilter@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).