From nobody Sun Dec 04 04:39:26 2022 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 4NPv8v1YRRz4jDpb; Sun, 4 Dec 2022 04:39:27 +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 4NPv8v132Wz4Hsn; Sun, 4 Dec 2022 04:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670128767; 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=fbedDhmqrYVUbP/+LfmqNFt3TKs/0PQhioG4E4q52tU=; b=HDmK1vHxtdn4Ag4hD6LpooRFOTni11Vl4IGzqbzlCijI6t5zRIVnDK5O1RoZQTlfHDb89c rTq0dgOCfTmpIAE7TmI+FvrQe7UnACTPpoxY4P6N880SVfoxb+hT4A0K2/xaax5kUnr3pj k9bwZHzyyHTJtnON2TEWu0RbxFzEutBFhrbuY3lnILs7+OaMDYzyvVFmwC0rElNgHaVsTT 6/V0MWnlO07M/NjyqBJSNPGIS1Vq1oOili3tpOUBoKepgpx9VRHYQP8TafiA2QLHDwbZv9 mziDaz9HvFKA6LV/8QgcCtzlZvDOMFMnaP5YLArkTAuY1h2tqdJGfyyXoWIy3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670128767; 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=fbedDhmqrYVUbP/+LfmqNFt3TKs/0PQhioG4E4q52tU=; b=Z9txkdfNoS/dI+cXAaAw5csgeFWs9R4jHTzC0bmsb6cHAAVrA8Tzcqn3I5yBkrcaPEKO2b x0iJ70Y7gMaXEuPa8wDwa/LZ8AxpeeJa5MSaOqfox53G0wIhR06+KQO6Y4HBc5vO8w3eNH OodaRI3urXjQnXiUGB0tM6U4nGxMJV043a+xYBWUotz1LwsmwqqDJOKTL1lTbjXe++a7uB lnZEW4ERVcrOjTZkGJlaQc5VdeOdjKDPYeEDsdvZ4KVdOkG/u7oy4BqLvcsGB4mIuB7U1w UOXY9jHxfH9eQOqJPrBaV3c/dpNJzXYY0yE/HYsQV5LRuvfUceOL1Wk7k0M7mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670128767; a=rsa-sha256; cv=none; b=BPtneyPHgAmddGKiFtTQ7GmzheV3sgEuncYNqDcEA6zYVAxgwKirQl/igAQ8tOAqxAA242 ZV8zSSz0XB3dhqyrBu98Y+rGjYMRQEcpp6GL+zSkxhPtxn+pHgoLk6CKWb2fdTuqM7rsLh 2KvudNo5keDnzJcL8kJ4zH5FnQeFNlZxXpQ1lc6JKInDd+evgwXz77QV+MGpog5AbpV2Pm nqJoXwIzFYBP888NdPy7jN6dlSBg0v1gvD2eKzewLumvd6bnXawJeBMO73JKpiva/oOlFy SEnBobQz6AmZacweP2jnm5bapsSuOKauliPEDrTcD5p5bOEEabNpqlIkeAxu9g== 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 4NPv8v08C1z1LDy; Sun, 4 Dec 2022 04:39:27 +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 2B44dQEQ074182; Sun, 4 Dec 2022 04:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B44dQQ8074181; Sun, 4 Dec 2022 04:39:26 GMT (envelope-from git) Date: Sun, 4 Dec 2022 04:39:26 GMT Message-Id: <202212040439.2B44dQQ8074181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: aed1e5d332f9 - main - stand/efi: Break stlye rules a little for easier sharing 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aed1e5d332f9d26cdd8477bc336279217d53ecb8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=aed1e5d332f9d26cdd8477bc336279217d53ecb8 commit aed1e5d332f9d26cdd8477bc336279217d53ecb8 Author: Warner Losh AuthorDate: 2022-12-04 00:23:25 +0000 Commit: Warner Losh CommitDate: 2022-12-04 00:23:25 +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 --- 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 4d4e50718f3a..1185908f64be 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -69,9 +69,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();