git: 720d25547745 - stable/14 - pac: Consistently use item count as the first argument to calloc
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 13 Feb 2025 17:51:30 UTC
The branch stable/14 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=720d255477453f77b1200880db4b9e776327150e
commit 720d255477453f77b1200880db4b9e776327150e
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2025-01-03 15:41:36 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2025-02-13 16:01:23 +0000
pac: Consistently use item count as the first argument to calloc
Reported by: GCC 14 -Wcalloc-transposed-args
(cherry picked from commit 22956bc9dc907296196a37525a6726f6ba2c06ed)
---
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 5eb5cab02353..d79b84c4ab9b 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -260,7 +260,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++];
@@ -338,7 +338,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;