c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-25 03:37:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix calloc(3) arguments order

Browse Source 
calloc(3) takes `nelem` (or `nmemb` in glibc) first, and then size of
elements.  No difference expected for having these in reverse order,
however should follow the standard.

http://pubs.opengroup.org/onlinepubs/009695399/functions/calloc.html

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@osnexus.com>
Closes #7405
This commit is contained in:
Tomohiro Kusumi
2018-04-13 02:50:39 +09:00
committed by Brian Behlendorf
parent 7403d0743e
commit 8111eb4abc
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libefi/rdwr_efi.c
+3 -3
View File
@@ -218,7 +218,7 @@ efi_get_info(int fd, struct dk_cinfo *dki_info)
memset(dki_info, 0, sizeof (*dki_info));
path = calloc(PATH_MAX, 1);
path = calloc(1, PATH_MAX);
if (path == NULL)
goto error;
@@ -403,7 +403,7 @@ efi_alloc_and_init(int fd, uint32_t nparts, struct dk_gpt **vtoc)
length = sizeof (struct dk_gpt) +
sizeof (struct dk_part) * (nparts - 1);
if ((*vtoc = calloc(length, 1)) == NULL)
if ((*vtoc = calloc(1, length)) == NULL)
return (-1);
vptr = *vtoc;
@@ -440,7 +440,7 @@ efi_alloc_and_read(int fd, struct dk_gpt **vtoc)
nparts = EFI_MIN_ARRAY_SIZE / sizeof (efi_gpe_t);
length = (int) sizeof (struct dk_gpt) +
(int) sizeof (struct dk_part) * (nparts - 1);
if ((*vtoc = calloc(length, 1)) == NULL)
if ((*vtoc = calloc(1, length)) == NULL)
return (VT_ERROR);
(*vtoc)->efi_nparts = nparts;