From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
nicolas.dichtel@6wind.com, donald.hunter@gmail.com,
jiri@resnulli.us, sdf@google.com,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v3 05/15] tools: ynl: create local ARRAY_SIZE() helper
Date: Tue, 27 Feb 2024 14:30:22 -0800 [thread overview]
Message-ID: <20240227223032.1835527-6-kuba@kernel.org> (raw)
In-Reply-To: <20240227223032.1835527-1-kuba@kernel.org>
libc doesn't have an ARRAY_SIZE() create one locally.
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
tools/net/ynl/lib/ynl-priv.h | 3 +++
tools/net/ynl/ynl-gen-c.py | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/net/ynl/lib/ynl-priv.h b/tools/net/ynl/lib/ynl-priv.h
index 1dfa09497be8..7f24d07692bf 100644
--- a/tools/net/ynl/lib/ynl-priv.h
+++ b/tools/net/ynl/lib/ynl-priv.h
@@ -27,6 +27,9 @@ enum ynl_policy_type {
YNL_PT_BITFIELD32,
};
+#define YNL_ARRAY_SIZE(array) (sizeof(array) ? \
+ sizeof(array) / sizeof(array[0]) : 0)
+
struct ynl_policy_attr {
enum ynl_policy_type type;
unsigned int len;
diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py
index 90d7bf4849fc..407902b903e0 100755
--- a/tools/net/ynl/ynl-gen-c.py
+++ b/tools/net/ynl/ynl-gen-c.py
@@ -1535,7 +1535,7 @@ _C_KW = {
cw.block_start()
if enum and enum.type == 'flags':
cw.p(f'{arg_name} = ffs({arg_name}) - 1;')
- cw.p(f'if ({arg_name} < 0 || {arg_name} >= (int)MNL_ARRAY_SIZE({map_name}))')
+ cw.p(f'if ({arg_name} < 0 || {arg_name} >= (int)YNL_ARRAY_SIZE({map_name}))')
cw.p('return NULL;')
cw.p(f'return {map_name}[{arg_name}];')
cw.block_end()
@@ -2569,7 +2569,7 @@ _C_KW = {
cw.p('.hdr_len\t= sizeof(struct genlmsghdr),')
if family.ntfs:
cw.p(f".ntf_info\t= {family['name']}_ntf_info,")
- cw.p(f".ntf_info_size\t= MNL_ARRAY_SIZE({family['name']}_ntf_info),")
+ cw.p(f".ntf_info_size\t= YNL_ARRAY_SIZE({family['name']}_ntf_info),")
cw.block_end(line=';')
--
2.43.2
next prev parent reply other threads:[~2024-02-27 22:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 22:30 [PATCH net-next v3 00/15] tools: ynl: stop using libmnl Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 01/15] tools: ynl: give up on libmnl for auto-ints Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 02/15] tools: ynl: create local attribute helpers Jakub Kicinski
2024-02-28 8:21 ` Nicolas Dichtel
2024-02-27 22:30 ` [PATCH net-next v3 03/15] tools: ynl: create local for_each helpers Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 04/15] tools: ynl: create local nlmsg access helpers Jakub Kicinski
2024-02-27 22:30 ` Jakub Kicinski [this message]
2024-02-27 22:30 ` [PATCH net-next v3 06/15] tools: ynl: make yarg the first member of struct ynl_dump_state Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 07/15] tools: ynl-gen: remove unused parse code Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 08/15] tools: ynl: wrap recv() + mnl_cb_run2() into a single helper Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 09/15] tools: ynl: use ynl_sock_read_msgs() for ACK handling Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 10/15] tools: ynl: stop using mnl_cb_run2() Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 11/15] tools: ynl: switch away from mnl_cb_t Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 12/15] tools: ynl: switch away from MNL_CB_* Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 13/15] tools: ynl: stop using mnl socket helpers Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 14/15] tools: ynl: remove the libmnl dependency Jakub Kicinski
2024-02-27 22:30 ` [PATCH net-next v3 15/15] tools: ynl: use MSG_DONTWAIT for getting notifications Jakub Kicinski
2024-02-28 23:50 ` [PATCH net-next v3 00/15] tools: ynl: stop using libmnl patchwork-bot+netdevbpf
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=20240227223032.1835527-6-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=donald.hunter@gmail.com \
--cc=edumazet@google.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
--cc=pabeni@redhat.com \
--cc=sdf@google.com \
/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).