From patchwork Tue May 18 12:34:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 1480233 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4FkwRn261wz9sWk for ; Tue, 18 May 2021 22:34:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245321AbhERMfp (ORCPT ); Tue, 18 May 2021 08:35:45 -0400 Received: from mail.netfilter.org ([217.70.188.207]:42770 "EHLO mail.netfilter.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243361AbhERMfm (ORCPT ); Tue, 18 May 2021 08:35:42 -0400 Received: from localhost.localdomain (unknown [90.77.255.23]) by mail.netfilter.org (Postfix) with ESMTPSA id 084AA6415E for ; Tue, 18 May 2021 14:33:27 +0200 (CEST) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nftables 1/2] src: use PRIu64 format Date: Tue, 18 May 2021 14:34:17 +0200 Message-Id: <20210518123418.64560-1-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Fix the following compilation warnings on x86_32. datatype.c: In function ‘cgroupv2_type_print’: datatype.c:1387:22: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘uint64_t’ {aka ‘long long unsigned int’} [-Wformat=] nft_print(octx, "%lu", id); ~~^ ~~ %llu meta.c: In function ‘date_type_print’: meta.c:411:21: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘uint64_t’ {aka ‘long long unsigned int’} [-Wformat=] nft_print(octx, "%lu", tstamp); ~~^ ~~~~~~ %llu Signed-off-by: Pablo Neira Ayuso --- src/datatype.c | 2 +- src/meta.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/datatype.c b/src/datatype.c index c4e66c4633f8..743505de44b6 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -1384,7 +1384,7 @@ static void cgroupv2_type_print(const struct expr *expr, if (cgroup_path) nft_print(octx, "\"%s\"", cgroup_path); else - nft_print(octx, "%lu", id); + nft_print(octx, "%" PRIu64, id); xfree(cgroup_path); } diff --git a/src/meta.c b/src/meta.c index 73d58b1f53b5..fdbeba26291a 100644 --- a/src/meta.c +++ b/src/meta.c @@ -408,7 +408,7 @@ static void date_type_print(const struct expr *expr, struct output_ctx *octx) * Do our own printing. The default print function will print in * nanoseconds, which is ugly. */ - nft_print(octx, "%lu", tstamp); + nft_print(octx, "%" PRIu64, tstamp); } static time_t parse_iso_date(const char *sym) From patchwork Tue May 18 12:34:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 1480232 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4FkwRm5Jxcz9sWX for ; Tue, 18 May 2021 22:34:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244463AbhERMfo (ORCPT ); Tue, 18 May 2021 08:35:44 -0400 Received: from mail.netfilter.org ([217.70.188.207]:42772 "EHLO mail.netfilter.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243977AbhERMfm (ORCPT ); Tue, 18 May 2021 08:35:42 -0400 Received: from localhost.localdomain (unknown [90.77.255.23]) by mail.netfilter.org (Postfix) with ESMTPSA id 2191364167 for ; Tue, 18 May 2021 14:33:28 +0200 (CEST) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nftables 2/2] datatype: skip cgroupv2 rootfs in listing Date: Tue, 18 May 2021 14:34:18 +0200 Message-Id: <20210518123418.64560-2-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210518123418.64560-1-pablo@netfilter.org> References: <20210518123418.64560-1-pablo@netfilter.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org cgroupv2 path is expressed from the /sys/fs/cgroup, update listing to skip the rootfs. Signed-off-by: Pablo Neira Ayuso --- src/datatype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/datatype.c b/src/datatype.c index 743505de44b6..7267d60895d8 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -1382,7 +1382,8 @@ static void cgroupv2_type_print(const struct expr *expr, cgroup_path = cgroupv2_get_path(SYSFS_CGROUPSV2_PATH, id); if (cgroup_path) - nft_print(octx, "\"%s\"", cgroup_path); + nft_print(octx, "\"%s\"", + &cgroup_path[strlen(SYSFS_CGROUPSV2_PATH) + 1]); else nft_print(octx, "%" PRIu64, id);