Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/stand/efiboot Remove now unused bootdefault() function.



details:   https://anonhg.NetBSD.org/src/rev/d3da56dd3eb3
branches:  trunk
changeset: 366693:d3da56dd3eb3
user:      wiz <wiz%NetBSD.org@localhost>
date:      Wed Jun 08 21:55:51 2022 +0000

description:
Remove now unused bootdefault() function.

Part of PR 56862.

diffstat:

 sys/arch/i386/stand/lib/bootmenu.c |  20 +-------------------
 sys/arch/i386/stand/lib/bootmenu.h |   3 +--
 sys/stand/efiboot/bootmenu.c       |  20 +-------------------
 sys/stand/efiboot/bootmenu.h       |   3 +--
 4 files changed, 4 insertions(+), 42 deletions(-)

diffs (100 lines):

diff -r 7193b410f48b -r d3da56dd3eb3 sys/arch/i386/stand/lib/bootmenu.c
--- a/sys/arch/i386/stand/lib/bootmenu.c        Wed Jun 08 21:43:45 2022 +0000
+++ b/sys/arch/i386/stand/lib/bootmenu.c        Wed Jun 08 21:55:51 2022 +0000
@@ -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 @@
        } 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)
 {
diff -r 7193b410f48b -r d3da56dd3eb3 sys/arch/i386/stand/lib/bootmenu.h
--- a/sys/arch/i386/stand/lib/bootmenu.h        Wed Jun 08 21:43:45 2022 +0000
+++ b/sys/arch/i386/stand/lib/bootmenu.h        Wed Jun 08 21:55:51 2022 +0000
@@ -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 */
diff -r 7193b410f48b -r d3da56dd3eb3 sys/stand/efiboot/bootmenu.c
--- a/sys/stand/efiboot/bootmenu.c      Wed Jun 08 21:43:45 2022 +0000
+++ b/sys/stand/efiboot/bootmenu.c      Wed Jun 08 21:55:51 2022 +0000
@@ -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 @@
        } 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)
 {
diff -r 7193b410f48b -r d3da56dd3eb3 sys/stand/efiboot/bootmenu.h
--- a/sys/stand/efiboot/bootmenu.h      Wed Jun 08 21:43:45 2022 +0000
+++ b/sys/stand/efiboot/bootmenu.h      Wed Jun 08 21:55:51 2022 +0000
@@ -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 */



Home | Main Index | Thread Index | Old Index