Module Name: src
Committed By: wiz
Date: Wed Jun 8 21:55:51 UTC 2022
Modified Files:
src/sys/arch/i386/stand/lib: bootmenu.c bootmenu.h
src/sys/stand/efiboot: bootmenu.c bootmenu.h
Log Message:
Remove now unused bootdefault() function.
Part of PR 56862.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/lib/bootmenu.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/i386/stand/lib/bootmenu.h
cvs rdiff -u -r1.4 -r1.5 src/sys/stand/efiboot/bootmenu.c
cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/bootmenu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/lib/bootmenu.c
diff -u src/sys/arch/i386/stand/lib/bootmenu.c:1.17 src/sys/arch/i386/stand/lib/bootmenu.c:1.18
--- src/sys/arch/i386/stand/lib/bootmenu.c:1.17 Mon Apr 2 09:44:18 2018
+++ src/sys/arch/i386/stand/lib/bootmenu.c Wed Jun 8 21:55:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bootmenu.c,v 1.17 2018/04/02 09:44:18 nonaka Exp $ */
+/* $NetBSD: bootmenu.c,v 1.18 2022/06/08 21:55:51 wiz Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -128,24 +128,6 @@ docommandchoice(int choice)
} while (*ic);
}
-void
-bootdefault(void)
-{
- int choice;
- static int entered;
-
- if (bootcfg_info.nummenu > 0) {
- if (entered) {
- printf("default boot twice, skipping...\n");
- return;
- }
- entered = 1;
- choice = bootcfg_info.def;
- printf("command(s): %s\n", bootcfg_info.command[choice]);
- docommandchoice(choice);
- }
-}
-
__dead void
doboottypemenu(void)
{
Index: src/sys/arch/i386/stand/lib/bootmenu.h
diff -u src/sys/arch/i386/stand/lib/bootmenu.h:1.6 src/sys/arch/i386/stand/lib/bootmenu.h:1.7
--- src/sys/arch/i386/stand/lib/bootmenu.h:1.6 Mon Apr 2 09:44:18 2018
+++ src/sys/arch/i386/stand/lib/bootmenu.h Wed Jun 8 21:55:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bootmenu.h,v 1.6 2018/04/02 09:44:18 nonaka Exp $ */
+/* $NetBSD: bootmenu.h,v 1.7 2022/06/08 21:55:51 wiz Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -33,6 +33,5 @@
int parsebootconf(const char *);
void doboottypemenu(void);
-void bootdefault(void);
#endif /* !_BOOTMENU_H */
Index: src/sys/stand/efiboot/bootmenu.c
diff -u src/sys/stand/efiboot/bootmenu.c:1.4 src/sys/stand/efiboot/bootmenu.c:1.5
--- src/sys/stand/efiboot/bootmenu.c:1.4 Fri Mar 25 21:23:00 2022
+++ src/sys/stand/efiboot/bootmenu.c Wed Jun 8 21:55:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bootmenu.c,v 1.4 2022/03/25 21:23:00 jmcneill Exp $ */
+/* $NetBSD: bootmenu.c,v 1.5 2022/06/08 21:55:51 wiz Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -133,24 +133,6 @@ docommandchoice(int choice)
} while (*ic);
}
-void
-bootdefault(void)
-{
- int choice;
- static int entered;
-
- if (bootcfg_info.nummenu > 0) {
- if (entered) {
- printf("default boot twice, skipping...\n");
- return;
- }
- entered = 1;
- choice = bootcfg_info.def;
- printf("command(s): %s\n", bootcfg_info.command[choice]);
- docommandchoice(choice);
- }
-}
-
__dead void
doboottypemenu(void)
{
Index: src/sys/stand/efiboot/bootmenu.h
diff -u src/sys/stand/efiboot/bootmenu.h:1.1 src/sys/stand/efiboot/bootmenu.h:1.2
--- src/sys/stand/efiboot/bootmenu.h:1.1 Sun Jun 21 23:53:26 2020
+++ src/sys/stand/efiboot/bootmenu.h Wed Jun 8 21:55:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bootmenu.h,v 1.1 2020/06/21 23:53:26 jmcneill Exp $ */
+/* $NetBSD: bootmenu.h,v 1.2 2022/06/08 21:55:51 wiz Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -33,6 +33,5 @@
int parsebootconf(const char *);
void doboottypemenu(void);
-void bootdefault(void);
#endif /* !_BOOTMENU_H */
