From patchwork Sat May 26 19:02:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 161503 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 207CEB6FA3 for ; Sun, 27 May 2012 05:03:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753191Ab2EZTCo (ORCPT ); Sat, 26 May 2012 15:02:44 -0400 Received: from seven.medozas.de ([188.40.89.202]:55493 "EHLO seven.medozas.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753985Ab2EZTCm (ORCPT ); Sat, 26 May 2012 15:02:42 -0400 Received: by seven.medozas.de (Postfix, from userid 25121) id 3535921A061E; Sat, 26 May 2012 21:02:38 +0200 (CEST) From: Jan Engelhardt 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 Message-Id: <1338058955-5789-2-git-send-email-jengelh@inai.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1338058955-5789-1-git-send-email-jengelh@inai.de> References: <20120526180654.GB31938@1984> <1338058955-5789-1-git-send-email-jengelh@inai.de> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 --- 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: