| Message ID | 20240503080234.104-1-peter0x44@disroot.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] Silence two instances of -Wcalloc-transposed-args | expand |
On Fri, May 3, 2024 at 10:03 AM Peter Damianov <peter0x44@disroot.org> wrote: > > libgcc/ > * libgcov-util.c (tag_counters): Swap order of arguments to xcalloc. > (topen_to_memory_representation): Likewise. Thanks, I pushed this for you. Richard. > Signed-off-by: Peter Damianov <peter0x44@disroot.org> > --- > libgcc/libgcov-util.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libgcc/libgcov-util.c b/libgcc/libgcov-util.c > index ba4b90a480d..f443408c4ab 100644 > --- a/libgcc/libgcov-util.c > +++ b/libgcc/libgcov-util.c > @@ -211,8 +211,8 @@ tag_counters (unsigned tag, int length) > gcc_assert (k_ctrs[tag_ix].num == 0); > k_ctrs[tag_ix].num = n_counts; > > - k_ctrs[tag_ix].values = values = (gcov_type *) xcalloc (sizeof (gcov_type), > - n_counts); > + k_ctrs[tag_ix].values = values = (gcov_type *) xcalloc (n_counts, > + sizeof (gcov_type)); > gcc_assert (values); > > if (length > 0) > @@ -526,7 +526,7 @@ topn_to_memory_representation (struct gcov_ctr_info *info) > if (n > 0) > { > struct gcov_kvp *tuples > - = (struct gcov_kvp *)xcalloc (sizeof (struct gcov_kvp), n); > + = (struct gcov_kvp *)xcalloc (n, sizeof (struct gcov_kvp)); > for (unsigned i = 0; i < n - 1; i++) > tuples[i].next = &tuples[i + 1]; > for (unsigned i = 0; i < n; i++) > -- > 2.39.2 >
diff --git a/libgcc/libgcov-util.c b/libgcc/libgcov-util.c index ba4b90a480d..f443408c4ab 100644 --- a/libgcc/libgcov-util.c +++ b/libgcc/libgcov-util.c @@ -211,8 +211,8 @@ tag_counters (unsigned tag, int length) gcc_assert (k_ctrs[tag_ix].num == 0); k_ctrs[tag_ix].num = n_counts; - k_ctrs[tag_ix].values = values = (gcov_type *) xcalloc (sizeof (gcov_type), - n_counts); + k_ctrs[tag_ix].values = values = (gcov_type *) xcalloc (n_counts, + sizeof (gcov_type)); gcc_assert (values); if (length > 0) @@ -526,7 +526,7 @@ topn_to_memory_representation (struct gcov_ctr_info *info) if (n > 0) { struct gcov_kvp *tuples - = (struct gcov_kvp *)xcalloc (sizeof (struct gcov_kvp), n); + = (struct gcov_kvp *)xcalloc (n, sizeof (struct gcov_kvp)); for (unsigned i = 0; i < n - 1; i++) tuples[i].next = &tuples[i + 1]; for (unsigned i = 0; i < n; i++)
libgcc/ * libgcov-util.c (tag_counters): Swap order of arguments to xcalloc. (topen_to_memory_representation): Likewise. Signed-off-by: Peter Damianov <peter0x44@disroot.org> --- libgcc/libgcov-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)