From nobody Mon Mar 07 16:21:04 2022 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 0673A19FD8FB; Mon, 7 Mar 2022 16:21:05 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KC3c06nR2z4Z59; Mon, 7 Mar 2022 16:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646670065; 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=yOg5IRiYxQ6tAIGWXB6LQQmEzU6OT13tzhma1G2qB9w=; b=yw7l5gD29uu3yEHWW9KFov9Apit7ZaW2myQ26Pc/b7TXswpYozrWLaisxgcCNLix0ksvZX 3epv5I4ypNbUA7pSpVBv08acAswMq1/+f+g/TdDx9lchNiJ04aPG9CPPbFIhgu7wbA+PW+ t3o2o3sMaCeKOF65gacE6ZI5sAGTpkNNf6NK+Udh7pCYjdshppktf1kXpPqxz18yNamDxA f3iSvjioLlcUid4urr7oar87lJ+/9weHT9BpHoJsZTKTc/jNEHTr85XA3fNXqzkt87noJq rjAmetuMvZM3TDDci876OIvdrF7QKJinKTTsp1sTq5hme86+jDgx7Ada2TDFyg== 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 C9B8B3909; Mon, 7 Mar 2022 16:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227GL4tN099340; Mon, 7 Mar 2022 16:21:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227GL47F099339; Mon, 7 Mar 2022 16:21:04 GMT (envelope-from git) Date: Mon, 7 Mar 2022 16:21:04 GMT Message-Id: <202203071621.227GL47F099339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3fe1f21fb364 - main - ctf: Avoid passing a caddr_t to roundup2() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fe1f21fb364e38f2bf7e7100dad59b067b27080 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646670065; 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=yOg5IRiYxQ6tAIGWXB6LQQmEzU6OT13tzhma1G2qB9w=; b=aXF9JHLChiSM7D1jnXFjvaDWGfNQdNTl0PY2KuOwG04daah84dhpnFcZaWn9tXNah2fRdg PMscvTNfQXDkOk81hqQmijltjDSHRv2+ZHeA1rlxv6yrP7Z6Ab90UWATMWEuV0J3Lbpp56 wgAFbBjFRUO9etfRrPFToh+mVKNcg40ElRZLPRKLw7nPj2lRhyHZuEs1CsImYXVjW3ZKOo ZABY2f9aqr64+1SBYK+65bP3hwPzEgmHxUC6EcK6viHqKEFOGpM2RVu/vGjsTQoWNalbSg +hTDi317OAS9H2kKbAr/MJT0CWL5wkxB7BAEeuOQZzhZVTiwy8sgoHBEhlA25g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646670065; a=rsa-sha256; cv=none; b=w5rAQ3eemqMy/68+kPNQUX11V1bFAYDpz2ATZtm6wLHHjfwurYndhL/bMF17eLIuD88HLr zZfltZQkxUpkwxTYJKp6LDB758lxHVk9C+VJz9rim5IwhW09myGcX6mDJcT011FBKh3Iav dZPkW/SdMIFXxyEx1ua/ibb+uzaau/6QUzjq1KMMMnRn/SooXJ4ddRXgMVBLKFGUYvtX/P 1IIdeYV9D0fVfOrYdj7/taAzxSY2yulZEXSTAHHxPGKKWOe+QXDl1EdosgbhjvbJ9Fs4kd Ryr1JE9CgACjQlXEitLH3Yit2BMRvmToCFgmNKnT9uXhUcRyU4AsrEYsmkkpgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3fe1f21fb364e38f2bf7e7100dad59b067b27080 commit 3fe1f21fb364e38f2bf7e7100dad59b067b27080 Author: Mark Johnston AuthorDate: 2022-03-07 16:18:40 +0000 Commit: Mark Johnston CommitDate: 2022-03-07 16:20:57 +0000 ctf: Avoid passing a caddr_t to roundup2() For some reason I can't reproduce this locally, but Jenkins complains. Reported by: Jenkins Fixes: bdf290cd3e1a ("ctf: Add v3 support to CTF tools, ctf{convert,dump,merge}") --- cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c index b3b4c1f7168f..01b18093443b 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c @@ -1333,7 +1333,7 @@ resurrect_types(ctf_header_t *h, tdata_t *td, tdesc_t **tdarr, int tdsize, tdp->t_fndef->fn_args[i] = tdarr[argid]; } - dptr = roundup2(dptr, 4); + dptr = (caddr_t) roundup2((uintptr_t) dptr, 4); break; case CTF_K_RESTRICT: