s390/tools: Use ARRAY_SIZE() to fix Coccinelle warnings

[PATCH] s390/tools: Use ARRAY_SIZE() to fix Coccinelle warnings

Posted by Thorsten Blum 1 year, 10 months ago

Fixes the following two Coccinelle/coccicheck warnings reported by
array_size.cocci:

	WARNING: Use ARRAY_SIZE
	WARNING: Use ARRAY_SIZE

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
 arch/s390/tools/gen_facilities.c   | 2 +-
 arch/s390/tools/gen_opcode_table.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c
index 68580cbea4e6..ebd8a947e97c 100644
--- a/arch/s390/tools/gen_facilities.c
+++ b/arch/s390/tools/gen_facilities.c
@@ -149,7 +149,7 @@ static void print_facility_lists(void)
 {
 	unsigned int i;
 
-	for (i = 0; i < sizeof(facility_defs) / sizeof(facility_defs[0]); i++)
+	for (i = 0; i < ARRAY_SIZE(facility_defs); i++)
 		print_facility_list(&facility_defs[i]);
 }
 
diff --git a/arch/s390/tools/gen_opcode_table.c b/arch/s390/tools/gen_opcode_table.c
index a1bc02b29c81..468b70c85f62 100644
--- a/arch/s390/tools/gen_opcode_table.c
+++ b/arch/s390/tools/gen_opcode_table.c
@@ -138,7 +138,7 @@ static struct insn_type *insn_format_to_type(char *format)
 	strcpy(tmp, format);
 	base_format = tmp;
 	base_format = strsep(&base_format, "_");
-	for (i = 0; i < sizeof(insn_type_table) / sizeof(insn_type_table[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(insn_type_table); i++) {
 		ptr = insn_type_table[i].format;
 		while (*ptr) {
 			if (!strcmp(base_format, *ptr))
-- 
2.44.0

Re: [PATCH] s390/tools: Use ARRAY_SIZE() to fix Coccinelle warnings

Posted by Heiko Carstens 1 year, 10 months ago

On Mon, Apr 08, 2024 at 12:55:17PM +0200, Thorsten Blum wrote:
> Fixes the following two Coccinelle/coccicheck warnings reported by
> array_size.cocci:
> 
> 	WARNING: Use ARRAY_SIZE
> 	WARNING: Use ARRAY_SIZE
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
> ---
>  arch/s390/tools/gen_facilities.c   | 2 +-
>  arch/s390/tools/gen_opcode_table.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c
> index 68580cbea4e6..ebd8a947e97c 100644
> --- a/arch/s390/tools/gen_facilities.c
> +++ b/arch/s390/tools/gen_facilities.c
> @@ -149,7 +149,7 @@ static void print_facility_lists(void)
>  {
>  	unsigned int i;
>  
> -	for (i = 0; i < sizeof(facility_defs) / sizeof(facility_defs[0]); i++)
> +	for (i = 0; i < ARRAY_SIZE(facility_defs); i++)
>  		print_facility_list(&facility_defs[i]);
>  }

Let's wait until a compile bot reports compile error. It would be
helpful to at least compile patches, before sending them.

Re: [PATCH] s390/tools: Use ARRAY_SIZE() to fix Coccinelle warnings

Posted by Thorsten Blum 1 year, 10 months ago

On 8. Apr 2024, at 13:51, Heiko Carstens <hca@linux.ibm.com> wrote:
> 
> Let's wait until a compile bot reports compile error. It would be
> helpful to at least compile patches, before sending them.

Sorry about that. I usually compile the patch before submitting it, but missed
this one somehow.

Just including the missing header file also doesn't work.

Please ignore this patch for now.