From nobody Thu Feb 13 17:51:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv2mp0qxKz5n3m1; Thu, 13 Feb 2025 17:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv2mn1F6Gz3w3P; Thu, 13 Feb 2025 17:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/p/b1nXmd6YlXnPRmmS6ydGzrKLOnI4oT+cNv0XM6ww=; b=lY6tzaXKp03UmknG10SQMsnRSEd3YsgZgYbBTNTdH+z9pG3AibMv6ZxrnSGCTOQzRBmkq7 Z5bE5N0xzzeLmzcfCVLukP5TSunvd/iZda0c7Up52iRNChlpiu8ibpGiJoXS0NeVzHpFgH 5KTi1u25xjj1SFBtxxuJe7V1pYRvgZP9UgVmleGlNbPW2fUOx88xXnCrtLN2nEFdcrBhKx tMpkmYhsA+qehhe768rmPps9VLMejpGEtLWnugvmY4xQimsaLk7SV02CNNAaL00Lrt/3rU EALijpHAzVIVzcZO3FiFmLd7XUmtMKa9eXy8xzBlgCxWW4FIpF3pQ70Pf40VDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/p/b1nXmd6YlXnPRmmS6ydGzrKLOnI4oT+cNv0XM6ww=; b=q4BCZpLWBbrik2m8HsZLtQYWhMMNVOlHPlBnAcI7yGKPD0xlXN7my8+BSxqKDzsOVJ3gFu NmE1824gR5hgAHbeXRwaZtzjyC8ewo3D2lcK/pFKC/Djf3KQo22/NfJ68XKz2vd7UFovlL g60cgijn44ac9/wxpguaiBf5NdOwLtuyunOI4/2PXhwPR2I28Zuch1Euma7xr2Xl/ItRBE E4Z1PUa3brYHr2pxH1woF78lsuzyXfvADzBvv1sim+RVQP5ngQIZR81RLBsOToS5ZjpNcl IIhKYsp/whu5P09pJMFHvs92MGlLXhsPL0gbemrPK2GnT4STrlKNoIKU3Evu3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739469097; a=rsa-sha256; cv=none; b=OoP/G/TOhADAecQ/UpsP+5Ls9p6zneiKN+qkwgcYfAhR/VpgIcu1Lb4DR3T3EzU3DbXgkl k2jzr2phX/a/q6xZ7YcuitxCPlXJr2wqYzrqBsDwgd1tlSDopKpgWXuNTq9zwJWvxSymFX cj9s+imn1JKfZPuiYhNsDDzwQlNQKy7TdgoYGpdsS5o9jHYI2/bTusCiJjE8GWh7g9N4ma cSkV5XNWWZYzJRIJ/el59sYnFJdlPqnL5jvx7Nuiu4+wNDUm5jblfN+fsAgMCjVldxRc0U 0g8XNRSkEmb0VKsgXYVDvf40OFMA1SbrSPlb4HcopJA1mRVyh3VZABg/XroCDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv2mn0f3ZzvqC; Thu, 13 Feb 2025 17:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DHpaae069414; Thu, 13 Feb 2025 17:51:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DHpaGE069411; Thu, 13 Feb 2025 17:51:36 GMT (envelope-from git) Date: Thu, 13 Feb 2025 17:51:36 GMT Message-Id: <202502131751.51DHpaGE069411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 749ec2967ed3 - stable/13 - pac: Consistently use item count as the first argument to calloc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 749ec2967ed3e157d6cd6cbe85b0ae953ae114c6 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=749ec2967ed3e157d6cd6cbe85b0ae953ae114c6 commit 749ec2967ed3e157d6cd6cbe85b0ae953ae114c6 Author: John Baldwin AuthorDate: 2025-01-03 15:41:36 +0000 Commit: John Baldwin CommitDate: 2025-02-13 17:49:06 +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;