From nobody Tue Jan 24 22:13:47 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 4P1h7v5XpTz3bgGn; Tue, 24 Jan 2023 22:13:47 +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 4P1h7v56HJz3JP1; Tue, 24 Jan 2023 22:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598427; 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=gYkdl5DP1I25DhIBcdGSxha+IVyBpSM0gL7BWqaWFZY=; b=QCLxhfwvJx2x/tOad2YJVYtQLlFOiO/qSuQ6njQgm098CojNwWpUMytc3xi50dQLNW515y seZACuetQkkOuuOP+FS6CH8O74uBFOvhsPEKmWBnCh8JvOM+YLoSabcJ/KmhXwR3Ou3ebC d0c96/rDqFSaJEf5hxU7Jv3/UYG9G8b5Yi/hKPJTvX5yPwKjwe/QWTB/c5u25QCp4ZQxmH emJWilY+vqZWhrnagi0JY0Sy1e12nv9EPxajazkYvnsaTcUvUQFH0Sxid548wkcJPWI1a6 fOivELSIfIhzW2UL08tUH7rKQOIEYYQB5m7CiWZsLAgvvBfPJKMgt9VD9hOSQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598427; 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=gYkdl5DP1I25DhIBcdGSxha+IVyBpSM0gL7BWqaWFZY=; b=WZaY0cYP9JcmWCsBZQG0q8Xia1FR84UXj5IjJpchvgETPVErBIfeX/QDALlrUIFWwxbbw5 LN3vTbgJ/Y4bNvQDQd0oEJgAjR/BlGKQeb9Td7NaFt0yTb2pZFi290QE4rM3fuuYFjegbM TFLnFZYAGELA6h+AljlD0n/kLGof5AAX+HpO/O0bx8C22iqz9LVhNZHgrfRxSpPQC3WDcZ ot5xbUtb2eBxOXOiscJtF6EltctPItYarnOy+7zGnPhoraTxDc51xrQPZjp4RYPpBqynOK WgGrckNZH1r+Fhr8rkTW76wvjvnP6pE+tzhcVkncotlPTrCQRc24ZISIrKgS6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598427; a=rsa-sha256; cv=none; b=VI2WbRPmmZlht7xvD9sa5y5KjlFM8+Mjd78e/IXMPdNGtLFSygfXTepfY/ADrCsUFt1aNV 70St19ppevEJyvFSd40vEEwQ47yEvZEeAKf2SofcChZG6xO6zz4dSXxHoGG2cvSqSDDzyk jDwYbQCKIxVXf+puAE/eqQzfcearc2p+KR21rk/1ILoB3ijo9H/7a+OtPqV8h7VsVZL1yH Kc3ZrIWWYRxVIb0Af1/dZjBMTj9mbtzQb059aDT8gBqOcizFtaGxf0xFeSgMJjeYTbbgmM v08l3SctnsN6P1YS4Ol7nt4Zpnm4z+nI2lIOINV+c6w86mer+OoShyb42D972Q== 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 4P1h7v42DpzQhD; Tue, 24 Jan 2023 22:13:47 +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 30OMDl1C088910; Tue, 24 Jan 2023 22:13:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDlCg088909; Tue, 24 Jan 2023 22:13:47 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:47 GMT Message-Id: <202301242213.30OMDlCg088909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 583dde3da0b6 - stable/13 - stand/efi: Break stlye rules a little for easier sharing 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 583dde3da0b64e772e0f10c1485d55cf2375d311 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=583dde3da0b64e772e0f10c1485d55cf2375d311 commit 583dde3da0b64e772e0f10c1485d55cf2375d311 Author: Warner Losh AuthorDate: 2022-12-04 00:23:25 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:42 +0000 stand/efi: Break stlye rules a little for easier sharing Break the style rules a little to allow easier sharing between efi and kboot. This will allow the ifdefs to be fewer in number. Sponsored by: Netflix (cherry picked from commit aed1e5d332f9d26cdd8477bc336279217d53ecb8) --- stand/efi/loader/bootinfo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 2187a09c1ebf..e05197189a46 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -71,9 +71,10 @@ bi_getboothowto(char *kargs) { const char *sw, *tmp; char *opts; - char *console; - int howto, speed, port; + int speed, port; char buf[50]; + char *console; + int howto; howto = boot_parse_cmdline(kargs); howto |= boot_env_to_howto();