git: 22956bc9dc90 - main - pac: Consistently use item count as the first argument to calloc
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 03 Jan 2025 15:49:00 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=22956bc9dc907296196a37525a6726f6ba2c06ed
commit 22956bc9dc907296196a37525a6726f6ba2c06ed
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2025-01-03 15:41:36 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2025-01-03 15:44:27 +0000
pac: Consistently use item count as the first argument to calloc
Reported by: GCC 14 -Wcalloc-transposed-args
---
usr.sbin/lpr/pac/pac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 22ed8bf7e3bb..260743f5c33a 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -248,7 +248,7 @@ dumpit(void)
hp = hashtab[0];
hno = 1;
- base = (struct hent **) calloc(sizeof hp, hcount);
+ base = (struct hent **) calloc(hcount, sizeof(hp));
for (ap = base, c = hcount; c--; ap++) {
while (hp == NULL)
hp = hashtab[hno++];
@@ -326,7 +326,7 @@ enter(const char name[])
return(hp);
h = hash(name);
hcount++;
- hp = (struct hent *) calloc(sizeof *hp, (size_t)1);
+ hp = (struct hent *) calloc(1, sizeof(*hp));
hp->h_name = strdup(name);
hp->h_feetpages = 0.0;
hp->h_count = 0;