From nobody Mon Aug 21 14:17:15 2023 X-Original-To: dev-commits-src-main@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 4RTvgc0Hypz4qqlT; Mon, 21 Aug 2023 14:17:16 +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 4RTvgb4wWSz3br4; Mon, 21 Aug 2023 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627435; 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=qBd2c/I3GapPQMO14vW5Up8KwnoXkb9aI+M6k85GLuk=; b=PMwReXcv+lzx+PfiJjdZ1GL3Ml9XYmADr3gsFSKnG4+IKHwFqDXcHGvxSRiXpGFIfxiVc+ qAbVLYsvPna8b7Tugs/I9TzQ3TPdwOrEPQ/DPoa1hsdDRpkb/T/00hdgDHTx2jQUIIDYV3 w1uK5KRqMXD2EhEnhPPDjjelVBJDWEpgrzDK+bLWAsR/TvYIqoPLXxvaUDsdM2LrF4+YoY +wyeyh+zvIO9fHVdVd99pseMX4nMMZBNSufa8Ew6JB+rlQ8pRJtEsLrvG0G0Gr3P65a8Vz 5A+77k9IaWGswJRVlissHxOaR3UZG32XL3J+AXIW+O6EGx3WnUoQGnGskfKDhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692627435; 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=qBd2c/I3GapPQMO14vW5Up8KwnoXkb9aI+M6k85GLuk=; b=SLQ68K/ool1pmSJdDLWNF67oA2hTIh8NpEWwGytuuTRWuO4WFw5ayuqVZGQZVUu62d8wWM PxSquXDoQzdVvpxXLFQG/9bdxl0NUDstZg3fJOye05CYK6yHC3DHD1NvoPiIbeueSF8vhG ZNT8HCEJqrd0Ahag/V8nKfAXi9dK/Qwc75dZf94ypRvig4HWaylx86fZ4osijxbekHdp55 rs8qBZgV/HQshCOpakQbfgoFe51dTiof8y3aKd8rKoo6DXD9/whAO2qQsv5wm+3eQj3e5V jxTeb3I9F61X0kkR4c+D375AXeKrcXelV6ze5WCfr3bFF5AhuyVc6Ve7D5y1Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692627435; a=rsa-sha256; cv=none; b=uSvOT+DjXSx+VYIWj6hDuL+cjz+avFHWfVynph3rh2i7X9xpHb2VqlzEMH9XxfCUftUVbg hdvAlTX+nnNthMVR7aZLGG7yU0+ukYNGpW+mO1zCwiwdgiC+/73Na/t9RmFodULT2SVuZ/ pXazmCGOumVS8JQHVUrFd8xfYcTQxRYPthIgJ56cjP+2bY9F/GY8QYm0FYT9Pem6mszjIf 4SbV0Ro0cPpzddrYtLu/gsmYgYMPUcJyYogAYnfL1ybT6/Eh+e8bQHpj10MQJ7Ap5UfRa6 Crp4fB52VOl/YgjCHXEMPt3zArIV7NeYgeSZHN6v5pRba8WOw4gKy7zgcJOOnw== 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 4RTvgb40Dkz8Pp; Mon, 21 Aug 2023 14:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LEHFMN097357; Mon, 21 Aug 2023 14:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LEHF7x097354; Mon, 21 Aug 2023 14:17:15 GMT (envelope-from git) Date: Mon, 21 Aug 2023 14:17:15 GMT Message-Id: <202308211417.37LEHF7x097354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6bb7f05850ef - main - rtld_malloc.c: change return type of cp2op() to void List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bb7f05850efceb01a7050e3c0fd86f9539c0071 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6bb7f05850efceb01a7050e3c0fd86f9539c0071 commit 6bb7f05850efceb01a7050e3c0fd86f9539c0071 Author: Konstantin Belousov AuthorDate: 2023-07-30 01:58:01 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-21 14:16:42 +0000 rtld_malloc.c: change return type of cp2op() to void for it to be useful to return unaligned pointer. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41150 --- libexec/rtld-elf/rtld_malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 3437f638d339..1246238b3941 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -106,10 +106,10 @@ static int pagesz; /* page size */ * increasing order. */ -static union overhead * +static void * cp2op(void *cp) { - return ((union overhead *)((caddr_t)cp - sizeof(union overhead))); + return (((caddr_t)cp - sizeof(union overhead))); } void *