From: Rongguang Wei <weirongguang@kylinos.cn>
Date: Tue, 26 Jul 2022 09:30:45 +0000 (+0800)
Subject: bpftool: Replace sizeof(arr)/sizeof(arr[0]) with ARRAY_SIZE macro
X-Git-Tag: v6.0-rc1~141^2~24^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5eff8c18f124e47da0be79fb2b776e1c2cac0b07;p=thirdparty%2Fkernel%2Flinux.git

bpftool: Replace sizeof(arr)/sizeof(arr[0]) with ARRAY_SIZE macro

Use the ARRAY_SIZE macro and make the code more compact.

Signed-off-by: Rongguang Wei <weirongguang@kylinos.cn>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20220726093045.3374026-1-clementwei90@163.com
---

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index f081de398b60c..c81362a001ba9 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -1962,7 +1962,7 @@ static int profile_parse_metrics(int argc, char **argv)
 	int selected_cnt = 0;
 	unsigned int i;
 
-	metric_cnt = sizeof(metrics) / sizeof(struct profile_metric);
+	metric_cnt = ARRAY_SIZE(metrics);
 
 	while (argc > 0) {
 		for (i = 0; i < metric_cnt; i++) {