From nobody Thu Feb 13 17:51:30 2025 X-Original-To: dev-commits-src-branches@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 4Yv2mf6LJBz5n3p0; Thu, 13 Feb 2025 17:51:30 +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 4Yv2mf3tl6z3vlj; Thu, 13 Feb 2025 17:51:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469090; 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=p8+SalvNjkFEoYKonkAfZeviGQy88mN46U87ka2WuRQ=; b=EirkjXVD+Ia84R60XBBDn7WftlRFOLIDeZ0vDCCuz9CvGyw3cCXZcVJ6g28EPm/Tg7jadQ YimFySoOTOWWX70kmKKQBxCLIDASdzGGSV2OckQ10+eXaOSsWm8QLlQ2GI4MKOpuECcKFk ZQ8VHSl09hvo3xgudg3tpq1HEE8KybSM+NT+ZWP0pIaVQcEEp/7GT5aJHbnj9+gtOryYY0 DPQ6buy6Kv54lDXNUhAxss4iek3vm7LSwcEi7PhRL70hqO3t15UKGwDYPcMmbS8q8iTRWc 4xqQDz1aFgoax+2w7e2q8MZ3LPH/1lze3tpbknSNmwES2Y7NFbO6hZ8TWl9Afw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469090; 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=p8+SalvNjkFEoYKonkAfZeviGQy88mN46U87ka2WuRQ=; b=G5SKnncwgDzl/yuiUzzTywT2+IaQQQwZPiQcf3hJ4EjdeSfSI+NkacgOBy1o9jNLNERgfU +GA7tfYWL+pUfECCpNMpc74UKbd6u4qByq/c+3QwgRj+DL4Z3cybALa3x4M98RvvOBA9PZ JrutjNoon1h3DZkD2Bip7lHvA0eBb//2P6hfnmrQdI53iS7csQNJgBHjgCbsZysAhx81uI oo1hOKSnahAyP+4BLcHsZexoF8hZVRHdz/vjodh5e8CWDb5tIOsKbStcuY7Yy9sCB4Utt/ UAYtAwJi8SlnvXBf9zvXujBr0TJB26eWPOSh5gY8S1b/usoilnwKluVEKCoJtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739469090; a=rsa-sha256; cv=none; b=felH0nyWZ1aCcGnHF1gpn5FG6GWcYoA+Q5EkICB5B+tQZF5H7cfCZj8D4yKTEh1G0P1K6w PHnzld5F702Lvin3JaidAsIO4db+If04ERkD3frcMKnuidH7MwgyGhvdzAnqD2ov3jwHi4 3Ru/TXJBYrIyG1uehF4FYcFftQKnT1SHoz24+kOzw5EwsuEJFCdsyPnj4uQMCPNJZBSJns KGhqZ1FnVIb1aLuQdTvwVfoLpDPH1rabjzzWzjw3HI5fgYF7Hui3bJPXIGMroZde9Odvw4 5BbuDRyVATe8yAhas7F7dCS7WYBuFTPgE0qLBA3/lnvNn4Endzq/+1v2hLcthw== 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 4Yv2mf3NqLzw6h; Thu, 13 Feb 2025 17:51:30 +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 51DHpUIM069220; Thu, 13 Feb 2025 17:51:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DHpUEa069217; Thu, 13 Feb 2025 17:51:30 GMT (envelope-from git) Date: Thu, 13 Feb 2025 17:51:30 GMT Message-Id: <202502131751.51DHpUEa069217@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: 720d25547745 - stable/14 - pac: Consistently use item count as the first argument to calloc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 720d255477453f77b1200880db4b9e776327150e Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=720d255477453f77b1200880db4b9e776327150e commit 720d255477453f77b1200880db4b9e776327150e Author: John Baldwin AuthorDate: 2025-01-03 15:41:36 +0000 Commit: John Baldwin 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;