Alexander Goncharov submitted this change.

View Change

Approvals: Robert Marko: Looks good to me, but someone else must approve Peter Marheine: Looks good to me, approved Elyes Haouas: Looks good to me, but someone else must approve build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved
add gcc-14 -Werror=calloc-transposed-args compatibility

gcc-14 added a new `-Wcalloc-transposed-args` warning. Documentation
says:

```
Warn about calls to allocation functions decorated with attribute
alloc_size with two arguments, which use sizeof operator as the earlier
size argument and don’t use it as the later size argument. This is a
coding style warning. The first argument to calloc is documented to be
number of elements in array, while the second argument is size of each
element, so calloc (n, sizeof (int)) is preferred over
calloc (sizeof (int), n).
```

Let's fix the existing occurrences.

Found-by: gcc v14.1.1 20240507
Signed-off-by: Alexander Goncharov <chat@joursoir.net>
Change-Id: Icb9842fbc2fa6ad4cd9dc9384c19fd3741eadb2e
Reviewed-on: https://review.coreboot.org/c/flashrom/+/82657
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Robert Marko <robimarko@gmail.com>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
---
M s25f.c
M spi25_statusreg.c
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/s25f.c b/s25f.c
index dd15efc..b0f2438 100644
--- a/s25f.c
+++ b/s25f.c
@@ -291,7 +291,7 @@
s25fs_read_cr(flash, CR3NV_ADDR));

/* Restore CR3V when flashrom exits */
- uint8_t *data = calloc(sizeof(uint8_t), 1);
+ uint8_t *data = calloc(1, sizeof(uint8_t));
if (!data) {
msg_cerr("Out of memory!\n");
return 1;
diff --git a/spi25_statusreg.c b/spi25_statusreg.c
index 98988af..ceb2c77 100644
--- a/spi25_statusreg.c
+++ b/spi25_statusreg.c
@@ -310,7 +310,7 @@
}

/* Restore status register content upon exit in finalize_flash_access(). */
- uint8_t *data = calloc(sizeof(uint8_t), 1);
+ uint8_t *data = calloc(1, sizeof(uint8_t));
if (!data) {
msg_cerr("Out of memory!\n");
return 1;

To view, visit change 82657. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: flashrom
Gerrit-Branch: main
Gerrit-Change-Id: Icb9842fbc2fa6ad4cd9dc9384c19fd3741eadb2e
Gerrit-Change-Number: 82657
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Goncharov <chat@joursoir.net>
Gerrit-Reviewer: Alexander Goncharov <chat@joursoir.net>
Gerrit-Reviewer: Anastasia Klimchuk <aklm@chromium.org>
Gerrit-Reviewer: Elyes Haouas <ehaouas@noos.fr>
Gerrit-Reviewer: Peter Marheine <pmarheine@chromium.org>
Gerrit-Reviewer: Robert Marko <robimarko@gmail.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Nikolai Artemiev <nartemiev@google.com>