mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-26 19:44:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

binutils: Fix calloc argument order in srconv.c

Browse Source 
GCC 14 will warn about calling calloc with swapped size and count
arguments.

binutils/srconv.c: In function ‘nints’:
binutils/srconv.c:598:36: error: ‘xcalloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
  598 |   return (int *) (xcalloc (sizeof (int), x));
      |                                    ^~~
binutils/srconv.c:598:36: note: earlier argument should specify number of elements, later size of each element

binutils/

	* srconv.c (nints): Swap xcalloc arguments.
	(wr_du): Likewise.
	(wr_dus): Likewise.
This commit is contained in:
Mark Wielaard 2024-01-22 00:47:46 +01:00
parent dd0c018e72
commit 91e9420f18
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binutils/srconv.c
View File

@ -595,7 +595,7 @@ wr_dps_end (struct coff_section *section ATTRIBUTE_UNUSED,
static int *
nints (int x)
{
return (int *) (xcalloc (sizeof (int), x));
return (int *) (xcalloc (x, sizeof (int)));
}
static void
@ -1183,7 +1183,7 @@ wr_du (struct coff_ofile *p, struct coff_sfile *sfile, int n)
du.spare = 0;
du.unit = n;
du.sections = p->nsections - 1;
du.san = (int *) xcalloc (sizeof (int), du.sections);
du.san = (int *) xcalloc (du.sections, sizeof (int));
du.address = nints (du.sections);
du.length = nints (du.sections);
@ -1242,7 +1242,7 @@ wr_dus (struct coff_ofile *p ATTRIBUTE_UNUSED, struct coff_sfile *sfile)
dus.efn = 0x1001;
dus.ns = 1; /* p->nsources; sac 14 jul 94 */
dus.drb = nints (dus.ns);
dus.fname = (char **) xcalloc (sizeof (char *), dus.ns);
dus.fname = (char **) xcalloc (dus.ns, sizeof (char *));
dus.spare = nints (dus.ns);
dus.ndir = 0;
/* Find the filenames. */