PPC + ARC: Fix calloc() call

Message ID 20231121134012.GA21972@lug-owl.de
State Accepted
Headers
Series PPC + ARC: Fix calloc() call |

Checks

Context Check Description
snail/binutils-gdb-check success Github commit url

Commit Message

Jan-Benedict Glaw Nov. 21, 2023, 1:40 p.m. UTC
  H!


Recently, -Walloc-size warnings started to kick in. Fix these two
calloc() calls to match the intended usage pattern.

opcodes/ChangeLog:

	* arc-dis.c (init_arc_disasm_info): Fix calloc() call.
	* ppc-dis.c (powerpc_init_dialect): Ditto.




Ok to commit?

MfG, JBG

--
  

Comments

Claudiu Zissulescu Nov. 21, 2023, 1:49 p.m. UTC | #1
Hi,

Ok. Please commit it.

Thank you,
Claudiu

-----Original Message-----
From: Jan-Benedict Glaw <jbglaw@lug-owl.de> 
Sent: Tuesday, November 21, 2023 3:40 PM
To: binutils@sourceware.org
Cc: Claudiu Zissulescu <claziss@synopsys.com>; Geoff Keating <geoffk@geoffk.org>; Alan Modra <amodra@gmail.com>; Peter Bergner <bergner@vnet.ibm.com>
Subject: [PATCH] PPC + ARC: Fix calloc() call

H!


Recently, -Walloc-size warnings started to kick in. Fix these two
calloc() calls to match the intended usage pattern.

opcodes/ChangeLog:

	* arc-dis.c (init_arc_disasm_info): Fix calloc() call.
	* ppc-dis.c (powerpc_init_dialect): Ditto.

diff --git a/opcodes/arc-dis.c b/opcodes/arc-dis.c index 59b668ff64e..7498e75cee2 100644
--- a/opcodes/arc-dis.c
+++ b/opcodes/arc-dis.c
@@ -147,7 +147,7 @@ static bool
 init_arc_disasm_info (struct disassemble_info *info)  {
   struct arc_disassemble_info *arc_infop
-    = calloc (sizeof (*arc_infop), 1);
+    = calloc (1, sizeof (*arc_infop));
 
   if (arc_infop == NULL)
     return false;
diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c index d97137d8b71..4d5652ebfeb 100644
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -348,7 +348,7 @@ powerpc_init_dialect (struct disassemble_info *info)  {
   ppc_cpu_t dialect = 0;
   ppc_cpu_t sticky = 0;
-  struct dis_private *priv = calloc (sizeof (*priv), 1);
+  struct dis_private *priv = calloc (1, sizeof (*priv));
 
   if (priv == NULL)
     return;



Ok to commit?

MfG, JBG

--
  
Peter Bergner Nov. 21, 2023, 3:19 p.m. UTC | #2
On 11/21/23 7:40 AM, Jan-Benedict Glaw wrote:
> Recently, -Walloc-size warnings started to kick in. Fix these two
> calloc() calls to match the intended usage pattern.
> 
> opcodes/ChangeLog:
> 
> 	* arc-dis.c (init_arc_disasm_info): Fix calloc() call.
> 	* ppc-dis.c (powerpc_init_dialect): Ditto.

Looks obvious to me, but to remove any doubt, the ppc change is ok.
Thanks!

Peter
  

Patch

diff --git a/opcodes/arc-dis.c b/opcodes/arc-dis.c
index 59b668ff64e..7498e75cee2 100644
--- a/opcodes/arc-dis.c
+++ b/opcodes/arc-dis.c
@@ -147,7 +147,7 @@  static bool
 init_arc_disasm_info (struct disassemble_info *info)
 {
   struct arc_disassemble_info *arc_infop
-    = calloc (sizeof (*arc_infop), 1);
+    = calloc (1, sizeof (*arc_infop));
 
   if (arc_infop == NULL)
     return false;
diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index d97137d8b71..4d5652ebfeb 100644
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -348,7 +348,7 @@  powerpc_init_dialect (struct disassemble_info *info)
 {
   ppc_cpu_t dialect = 0;
   ppc_cpu_t sticky = 0;
-  struct dis_private *priv = calloc (sizeof (*priv), 1);
+  struct dis_private *priv = calloc (1, sizeof (*priv));
 
   if (priv == NULL)
     return;