git: 57be21fae07e - stable/14 - ctld: Consistently use item count as the first argument to calloc
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 30 Nov 2024 16:51:23 UTC
The branch stable/14 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=57be21fae07e5994aaab98910ed4a370a4a8aa2f
commit 57be21fae07e5994aaab98910ed4a370a4a8aa2f
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-07-19 17:07:22 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-11-30 13:55:58 +0000
ctld: Consistently use item count as the first argument to calloc
Reported by: GCC 14 -Wcalloc-transposed-args
Reviewed by: rlibby, imp, emaste
Differential Revision: https://reviews.freebsd.org/D46013
(cherry picked from commit 2ba12978f67432a3f88b17704391d28e1fc0e788)
---
usr.sbin/ctld/isns.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/ctld/isns.c b/usr.sbin/ctld/isns.c
index 3c85c1a3cade..12aacbdef2b2 100644
--- a/usr.sbin/ctld/isns.c
+++ b/usr.sbin/ctld/isns.c
@@ -49,14 +49,14 @@ isns_req_alloc(void)
{
struct isns_req *req;
- req = calloc(sizeof(struct isns_req), 1);
+ req = calloc(1, sizeof(struct isns_req));
if (req == NULL) {
log_err(1, "calloc");
return (NULL);
}
req->ir_buflen = sizeof(struct isns_hdr);
req->ir_usedlen = 0;
- req->ir_buf = calloc(req->ir_buflen, 1);
+ req->ir_buf = calloc(1, req->ir_buflen);
if (req->ir_buf == NULL) {
free(req);
log_err(1, "calloc");