From nobody Fri Jul 19 17:07:42 2024 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 4WQbhb11Myz5RykV; Fri, 19 Jul 2024 17:07:43 +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 4WQbhZ6ZfDz58yq; Fri, 19 Jul 2024 17:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721408862; 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=3QZqmAUg7NBxoSUxTzRpHe/06ig2uD6BYFbpw4SH3yk=; b=er0yOKchBIrJGixP1l6cH+8FNVqdFIglkyuopUrwkEzlSafkyVg0t77hamDk8umVRsj3qN gXN+jcV1ZFKT0/1K33NxQ2lL/fV2llSPw1mPucziihUggtsN5I1iD4dxn0FmaSca30dLJb nmjzKKKIXeTvk27ZzVTKVE7L0MGREJMp9ocQJ/KtdESZ3Zl6K3cz0+pxvep1z3NOx148KI wPrFpTldUnnzpNSkEe3T2QN0+VGj3t3s5+/DOf8/QN3dw67yi8kaP7jdjJ5yBVnQ/XTBi1 EElwgFbuNpW1C6SBauVebhwt4+rADXx+oZl98Swgc73+I0bTsoVAAbVdrfA8RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721408862; a=rsa-sha256; cv=none; b=Wwhc49hD9M4zlTG7ywyQr5rfffRy0wG3Xv6WDe59SIhxc1zIBU/U0DLZDnc2YmL5bIZ4Hm uUe2z1va6+JhMzj/C76e3x9sCLFkGc9TCY1Brwiv2fAvLXdx89j+WdblPUrFYj4/qEEWD/ 6droCsoW+ac2gQIjLVpj3aebwVPPEoZY8n5VWQzFSPh3nATPBzC6Cy5OYzbUTAXAUsWUpH h00ASxQd+G+NT22XIk6uK3GKqYhdJW8mEqWbsxT8QeRfl9t3w294723p0SS0QNaLwZS8ur EZLwMI3f1Vllk6ZLDLkuujUTacwWIOVBXq+tBIDWBcJ/TEiSWs7OqJgjOTrIUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721408862; 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=3QZqmAUg7NBxoSUxTzRpHe/06ig2uD6BYFbpw4SH3yk=; b=lwtaJytoLKO3CbuHRFuQmU6uMiAfHHmUo7AQ0WK6Zjuyq4JLhB5O9XN0L0JoDsZNlVmoHH N84qygsYtx2AOkfx88E5J83NfHgK1NNfey40rvz3DuKGR4Q2TMANSkA2+UR/BjFLv5naG9 rZQtNw0KzYf029RGi/LXmlRBZm2Gb875rgq+xtfyy5cEOuPkDRKXueu4DxpBzWbzUT49pu pfwiKkfwc4+QG6nBWfhAPIVFmHK498ab5Usa+aHoI/VuNNjJWPOkOYNGLzavVokP7WCIhE HdAHMe9pDq6qK2deH68hFZbCIPVX7PFn0Y3jD2AVnmcXTlusH8fAUEbybP9naw== 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 4WQbhZ6BcTzgbH; Fri, 19 Jul 2024 17:07:42 +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 46JH7gNO027844; Fri, 19 Jul 2024 17:07:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JH7gDF027841; Fri, 19 Jul 2024 17:07:42 GMT (envelope-from git) Date: Fri, 19 Jul 2024 17:07:42 GMT Message-Id: <202407191707.46JH7gDF027841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bf3b889a5be1 - main - libgeom: 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/main X-Git-Reftype: branch X-Git-Commit: bf3b889a5be141f3abadcfc5a1d1cbdc50273d72 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bf3b889a5be141f3abadcfc5a1d1cbdc50273d72 commit bf3b889a5be141f3abadcfc5a1d1cbdc50273d72 Author: John Baldwin AuthorDate: 2024-07-19 17:02:05 +0000 Commit: John Baldwin CommitDate: 2024-07-19 17:06:03 +0000 libgeom: 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/D46006 --- lib/libgeom/geom_xml2tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 49cbb0385770..2d2c43e29e77 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -407,7 +407,7 @@ geom_xml2tree(struct gmesh *gmp, char *p) free(mt); return (error); } - gmp->lg_ident = calloc(sizeof *gmp->lg_ident, mt->nident + 1); + gmp->lg_ident = calloc(mt->nident + 1, sizeof(*gmp->lg_ident)); free(mt); if (gmp->lg_ident == NULL) return (ENOMEM);