diff options
| author | Sam James <sam@gentoo.org> | 2023-11-07 23:31:20 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2024-04-17 00:36:01 -0400 |
| commit | aa11daba2081da28ec70c557eefd5039a99555a3 (patch) | |
| tree | b253931379ee9b6d60eddb6dbc32bff1dd2f5abe | |
| parent | 1275bbaaea7ffd42346789f945c2f4dcddbfbbc8 (diff) | |
| download | e2fsprogs-aa11daba2081da28ec70c557eefd5039a99555a3.tar.gz | |
ext2fs: fix -Walloc-size
GCC 14 introduces a new -Walloc-size included in -Wextra which gives:
```
lib/ext2fs/hashmap.c:37:36: warning: allocation of insufficient size ‘1’ for type ‘struct ext2fs_hashmap’ with size ‘20’ [-Walloc-size]
```
The calloc prototype is:
```
void *calloc(size_t nmemb, size_t size);
```
So, just swap the number of members and size arguments to match the prototype, as
we're initialising 1 struct of size `sizeof(...)`. GCC then sees we're not
doing anything wrong.
Signed-off-by: Sam James <sam@gentoo.org>
Link: https://lore.kernel.org/r/20231107233122.2013191-1-sam@gentoo.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | lib/ext2fs/hashmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ext2fs/hashmap.c b/lib/ext2fs/hashmap.c index 697b2bcc6..15794673e 100644 --- a/lib/ext2fs/hashmap.c +++ b/lib/ext2fs/hashmap.c @@ -34,8 +34,8 @@ struct ext2fs_hashmap *ext2fs_hashmap_create( uint32_t(*hash_fct)(const void*, size_t), void(*free_fct)(void*), size_t size) { - struct ext2fs_hashmap *h = calloc(sizeof(struct ext2fs_hashmap) + - sizeof(struct ext2fs_hashmap_entry) * size, 1); + struct ext2fs_hashmap *h = calloc(1, sizeof(struct ext2fs_hashmap) + + sizeof(struct ext2fs_hashmap_entry) * size); if (!h) return NULL; |