From nobody Mon May 20 04:08:46 2024 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 4VjPFV4cvzz5LhTF; Mon, 20 May 2024 04:08:46 +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 4VjPFV201Yz4DBw; Mon, 20 May 2024 04:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716178126; 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=H3kNsEMVhlDlDBdLpeFp4cluhMZp8tBgGZBSBWDZcBg=; b=bIj0mYV37o4dR+A3BKc5HFgeu8AiaRs6om+BU8JJhMmuuAJTgZcIoh03EHVY/4uuGFkVI3 b+jLrsKkon8WSjsmqUywLnMPjQ1qaHnz/KCXwtYxP/eQ2Du/b17zdzqgsPFY9B237i/BT5 nYw+kNZQ+BNdlBxvZq0/q8rQO5/bnU0F3W0w++KM6fjf18v4UtaauTSGkShXFf87Sn+Lbj VfeUsQtlqPtleKI/qyfTZG8g9yCeQy3yjkPIpD6UlHHH2gKfFIc2DwfYlAye376WTrf1Hv bDYh8shggS34UMACEhP4ZPro9HARzTstNLaLswtDezCSxQgsPhyzdSDFPeRogQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716178126; a=rsa-sha256; cv=none; b=uiOAjPdnxd6/wzhLPt62PxF6sIcdtuPzt5iTWGiRB52zniv02a016Xts2LVP+fQWlWTY29 x7h2edC+6sWc8I31SokG5rz7hOIR6D09HDOriP1mSqWsyiujWvePSZIO0atuCZl+N/LKHN Qj3hribWD3Pt25BMDqCZ4dJCHaPYz6JDFJ1cjRwhYrcvwmeYsvaynLZ/J68r+BqYKlz8aY lo7lsFJGGAWia4w2092uCl2GWnao6gG28swgWiMFccWezDB1yvOFr30qI/tud6WEBFaZ2S tePiireZgSE1s5cRSV/ryEFT+kM8MT/XXKy+xdhAcBGy6K3Zzyxo2Y5j80azOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716178126; 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=H3kNsEMVhlDlDBdLpeFp4cluhMZp8tBgGZBSBWDZcBg=; b=fAtWRFbFRVen3yrtKJBBNnxL+Hp+tM4V3E50Ek1L49MgJlaBESKz3hWyZRTWlBUlbIrjNh YKOsRkoMgC6WzU+XAYAG1u6E8pyQJI/PYRThFER8tezJwb2bqocpIs1DWY8CrdQGz4U+nK S0PpFKzJ2JXbXHAB0a80jTuJ/8jv9NHY4R+RcDu48QdzzXHj6et6kErXgg7ne2+yFlD2l1 X6jL7OJEOHpJhfhqgFG3wFfnDUboVsXaXWF6FgNk7wKQaNVZgurAiUF9fwrsKwjWYR+IHs Fgcppi634mi5Chos/6+epjL4cukRMIqJSbjy3qWRsYrb8ibXAr0ODU8qWZC9+Q== 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 4VjPFV1QWCzNHL; Mon, 20 May 2024 04:08:46 +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 44K48kTa081585; Mon, 20 May 2024 04:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44K48k6Z081582; Mon, 20 May 2024 04:08:46 GMT (envelope-from git) Date: Mon, 20 May 2024 04:08:46 GMT Message-Id: <202405200408.44K48k6Z081582@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: 2d425b634f74 - main - loader: c_init returns 0 or 1 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 2d425b634f742ca7a803ab678ad9226607335161 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2d425b634f742ca7a803ab678ad9226607335161 commit 2d425b634f742ca7a803ab678ad9226607335161 Author: Warner Losh AuthorDate: 2024-05-19 21:08:40 +0000 Commit: Warner Losh CommitDate: 2024-05-20 04:05:42 +0000 loader: c_init returns 0 or 1 c_init returns 0 (success) or 1 (failure). Don't return other values. Sponsored by: Netflix --- stand/efi/libefi/eficom.c | 4 ++-- stand/i386/libi386/comconsole.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index d5f3f07e083f..f1ce14eb50f8 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -390,10 +390,10 @@ static int comc_init(int arg __unused) { if (comc_setup()) - return (CMD_OK); + return (0); eficom.c_flags &= ~(C_ACTIVEIN | C_ACTIVEOUT); - return (CMD_ERROR); + return (1); } static void diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c index b2d48b13a9f4..dc6bbcfe9806 100644 --- a/stand/i386/libi386/comconsole.c +++ b/stand/i386/libi386/comconsole.c @@ -140,8 +140,8 @@ comc_init(int arg) if ((comconsole.c_flags & (C_PRESENTIN | C_PRESENTOUT)) == (C_PRESENTIN | C_PRESENTOUT)) - return (CMD_OK); - return (CMD_ERROR); + return (0); + return (1); } static void