From nobody Mon Aug 28 00:28:22 2023 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 4RYrxy4V5hz4rpfJ; Mon, 28 Aug 2023 00:28:22 +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 4RYrxy3kVqz3XlW; Mon, 28 Aug 2023 00:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693182502; 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=gEqtruxBCThEz3RjCO35wB17be3ztyycDm9vh9TnPHM=; b=kTz6FQKcJSAwnMSuAdsCTgmC1VfweS1CJyqndBjNVLDN0CzgSayy4CpXFfdcp8FJLEWup6 IkRwZoFh8wogt3aY9+QpeCL8oiU2YcsTSPu/0CHadLx3tV1wvBMRetT8JW+EQU58lGJlLO Hk1YSseKMcaGVh1EY0EkADvBub3BZnEwA7B0lcEgv2sMGTXFfm/jW9ZUgECqbJ+JI5E71i 2ye0p0kfCmeHglldDy94lGvdBPw5HKQZFliJNlz59YRl/wuH0oJSLUJXXyloZP2k2V+iOX vrNUQr+gR/XuXsCShIKceE5Jhxny1qEnTx2IFIYMHnsN/bImIhMJRY4muR978A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693182502; 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=gEqtruxBCThEz3RjCO35wB17be3ztyycDm9vh9TnPHM=; b=JErhtw8Ho1obNvUDbVaT4lBInep+dVWPUuIqjTHhH6LatCYxlfxaOJ2wFSpGRjCGXJSL34 d5IoXwaFPJUOQ42rCoBApQEShvNpLL1UT5aV0z3xARNXoMKyz796+N6eISOmveJS7SgMU8 sqahlNl36T7G1FmoUvcZBCRVKhs/cxFEeHqhIS6Xr9Q3Qq/rXy8Q6djjHu0sc01nEBp/6h hR7406wo5oOqG+eWg15wgq0C3zfTarZEtQA3u9df7gL6M8HIkfcDVmszeiK7jfWh+JF+4u nMYZ0AFic5OW1ZWm8tWU6N6uQ5vIHf1yoBAtSAB9BlAeEEevWp1TzXcqrF2ZXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693182502; a=rsa-sha256; cv=none; b=gKEhf+qJcmOG1KzAaLvqGNUiJ3A/hR0fvxd4jBCBII85AemoYI9KnFLe4q9Rds23Kj85ZB oLB6gU6aSV8gnr29ibBAnVMP8E6lUvxrHGjiKPAMiAptpdR/jJBbhmjpDaXYuhnsdmsHju YynasXypEruPGxQiSg8EbS61hrRMU1Tu49m/QauUVWVPc/M+8FEjix5SfJvQgXr/bsBMCW X64VyK4g03pjkvYO6X4PiSX7Y80adW67vCYttkLPahlCVwvgJ9eR1ydkV2U4mEjdRq6p9t ou1nt4P2Hjpnc81lZ7F7bUOm4Y2mCgvTab/GdaOfPqQIEr3G02P5u8nzun1d6w== 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 4RYrxy2ZlDzng9; Mon, 28 Aug 2023 00:28:22 +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 37S0SMoj069705; Mon, 28 Aug 2023 00:28:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37S0SMSf069702; Mon, 28 Aug 2023 00:28:22 GMT (envelope-from git) Date: Mon, 28 Aug 2023 00:28:22 GMT Message-Id: <202308280028.37S0SMSf069702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8925d38da3a7 - stable/13 - rtld_malloc.c: change return type of cp2op() to void 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8925d38da3a70733b1c40717560dc58caf39e0c0 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8925d38da3a70733b1c40717560dc58caf39e0c0 commit 8925d38da3a70733b1c40717560dc58caf39e0c0 Author: Konstantin Belousov AuthorDate: 2023-07-30 01:58:01 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-28 00:27:48 +0000 rtld_malloc.c: change return type of cp2op() to void (cherry picked from commit 6bb7f05850efceb01a7050e3c0fd86f9539c0071) --- 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 *