Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 May 2024 04:08:46 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 2d425b634f74 - main - loader: c_init returns 0 or 1
Message-ID:  <202405200408.44K48k6Z081582@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=2d425b634f742ca7a803ab678ad9226607335161

commit 2d425b634f742ca7a803ab678ad9226607335161
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-05-19 21:08:40 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405200408.44K48k6Z081582>