From nobody Fri Dec 10 02:34:08 2021 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 03FB918E5C44; Fri, 10 Dec 2021 02:34:09 +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 4J9FN04BThz4s5x; Fri, 10 Dec 2021 02:34:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7109B127A9; Fri, 10 Dec 2021 02:34:08 +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 1BA2Y8bl060806; Fri, 10 Dec 2021 02:34:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BA2Y8BB060805; Fri, 10 Dec 2021 02:34:08 GMT (envelope-from git) Date: Fri, 10 Dec 2021 02:34:08 GMT Message-Id: <202112100234.1BA2Y8BB060805@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: 9e75c46527df - stable/13 - imgact_aout.c: some style 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: 9e75c46527dffdf0703862adfb1054c1b221e88d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639103648; 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=R/MMTrNB3yvj9200wsbjv5+PcQww5/nh8yR7J7j7y6o=; b=ItCwBdrTZdd6R3HCp/AMN0kwu8xMiGQKTMuo7R32HzSq2YuyFSdxuPVVX7VuJuMvutw53R 4wuDS4Fg8Eb25LIwOnqHxDYwwYAFE2p78MDnmbj8LQMK70sPpk9Xejb6rFf74iVvww/iDw 8G9Ue1pe5adZ6gpKDnuHnDpWEGhVdUNH/MynqhxoQG06B2he35pUybd4FqPqc+58IG4kLj dRkdx5X18LE9kjJ7PnRgr5A+TGZJAPLJb7u5dAeqVr+xW7V64clhL2w9YrFNHWD46U5WZU r6hlUzSZJzynCS0NTxVwPaR1DGoac2tP+WlF74vgnwTmR1CWfjSoT/XbYySYXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639103648; a=rsa-sha256; cv=none; b=UNSx+GIKN7JeG+OqUZ0i2qvU5fsDdTj8Zh2UhBza0z58kQ6nwcNy45Q4Gete8Gwur0Mn2y u5XjkFbFEccmcLRW1jfBOxDgrpwVfTNylraY8qZf1lOSPK0e+JzV6xZcq70hdDD0dtrDLs JdFITYdqQCvTMpbD7/sd418+2zyktOSkD6fKLimQO3y2vQ7ZOWPN41kqwH6sX06+uQI4v6 nG0rMxf2+j8F/Bft7u5faXpfvfbIlPiNU+VhR2axYx7u0bajg1yW7ToMm01xCPaG4joL9E sxsphd6Vm4FQETyAvqbnITt6URxi3CMcCOO3K5hWw3x8eF1NTXU0XgNc7sRKcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9e75c46527dffdf0703862adfb1054c1b221e88d commit 9e75c46527dffdf0703862adfb1054c1b221e88d Author: Konstantin Belousov AuthorDate: 2021-12-03 10:32:35 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-10 02:32:18 +0000 imgact_aout.c: some style (cherry picked from commit 290e05dde058b50aec48464d7116a55c7417575e) --- sys/kern/imgact_aout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index b66c60138c61..6c1b6bf0bb6b 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -159,7 +159,7 @@ aout_fixup(uintptr_t *stack_base, struct image_params *imgp) static int exec_aout_imgact(struct image_params *imgp) { - const struct exec *a_out = (const struct exec *) imgp->image_header; + const struct exec *a_out; struct vmspace *vmspace; vm_map_t map; vm_object_t object; @@ -169,6 +169,8 @@ exec_aout_imgact(struct image_params *imgp) unsigned long bss_size; int error; + a_out = (const struct exec *)imgp->image_header; + /* * Linux and *BSD binaries look very much alike, * only the machine id is different: @@ -178,7 +180,7 @@ exec_aout_imgact(struct image_params *imgp) if (((a_out->a_midmag >> 16) & 0xff) != 0x86 && ((a_out->a_midmag >> 16) & 0xff) != 0 && ((((int)ntohl(a_out->a_midmag)) >> 16) & 0xff) != 0x86) - return -1; + return (-1); /* * Set file/virtual offset based on a.out variant.