From nobody Mon Dec 06 18:48:23 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 6FE1C18B5A21; Mon, 6 Dec 2021 18:48:24 +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 4J7C9z5M68z4SRZ; Mon, 6 Dec 2021 18:48:23 +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 60936113AF; Mon, 6 Dec 2021 18:48:23 +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 1B6ImNIi065192; Mon, 6 Dec 2021 18:48:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6ImNj7065191; Mon, 6 Dec 2021 18:48:23 GMT (envelope-from git) Date: Mon, 6 Dec 2021 18:48:23 GMT Message-Id: <202112061848.1B6ImNj7065191@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: 290e05dde058 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 290e05dde058b50aec48464d7116a55c7417575e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638816504; 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=ySnvXeGDrw9I7uMA0O/n3BIxk22+oDQD6H1+cr6DeYY=; b=h5SrPNm86JNKJADS/SEPTYFNOh3Xfdg4LTJi1sOt1XSzMzm8xEE6jRg4YYt9Z+TI9ZVp1O wAiNWPdsHeyWrjrPDbst4Vns2qWnUyumO5l7YwKhbiMOVOr1eXFnEaPuVJNsZCiLK0ek5Y 1kaSQwmhWjg+2Z2adFX7qTKq98RtvapE974C2J4DHO83aiXGqZN3Ds2qQMlOLHh4z1H20l SuO0h19I7w6wpXXGUzFN55R6RaeVzU+QbYCCxjzcgJ/tElOuzlbc3Pqp3LJjpoHpr9yUi9 M/3/nsB1fqeCtB1Y2n47hK3G8T2lzg3uMEyIB25lNZ7/FJkTQbxnbEdtbrDD1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638816504; a=rsa-sha256; cv=none; b=iRrE51oPxFBmxfaPAJpqWSgY7KZgKrRVuK/+qLHILZxT7ZZ+F3kCWm+x6y3XK/IOrd/Cos n87cH9+IQEpJ5rH5ZeANAvrgb9uja4JI9cl2cqyZ3cHarzSuFfMfUl2Oi0TrVoRCekTgZ+ imz59GHH1he6UENYVm9vjj+FrBW8ilUaqei1U8adR+bIKYfHc+lVxsJ0s8fVqWyouBAva6 bojKEscwk54adh3yxxT7F/QHEHBmcQEXBNMAG+L7eo14AKTDU5sCiRAqg2mUO+hCBoD1xv qJfZIZyqj3xSHyMN4aoym3CB0STq88zmjbt8Q8TCKnnNuzyJjo9z+Yim7ffSgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=290e05dde058b50aec48464d7116a55c7417575e commit 290e05dde058b50aec48464d7116a55c7417575e Author: Konstantin Belousov AuthorDate: 2021-12-03 10:32:35 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-06 18:46:49 +0000 imgact_aout.c: some style Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D32960 --- 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 560803db4a86..5e0721254dd2 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -161,7 +161,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; @@ -171,6 +171,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: @@ -180,7 +182,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.