[src/trunk]: src/usr.sbin/sysinst/arch/mac68k Remove a few more (ab-)usages o...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/457730974cb3
branches:  trunk
changeset: 338124:457730974cb3
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 11 12:57:55 2015 +0000

description:
Remove a few more (ab-)usages of "yesno".

diffstat:

 usr.sbin/sysinst/arch/mac68k/md.c        |  16 ++++++++--------
 usr.sbin/sysinst/arch/mac68k/menus.md.de |  12 ++++++------
 usr.sbin/sysinst/arch/mac68k/menus.md.en |  12 ++++++------
 usr.sbin/sysinst/arch/mac68k/menus.md.es |  12 ++++++------
 usr.sbin/sysinst/arch/mac68k/menus.md.pl |  12 ++++++------
 5 files changed, 32 insertions(+), 32 deletions(-)

diffs (185 lines):

diff -r abd25e8c123a -r 457730974cb3 usr.sbin/sysinst/arch/mac68k/md.c
--- a/usr.sbin/sysinst/arch/mac68k/md.c Mon May 11 10:43:10 2015 +0000
+++ b/usr.sbin/sysinst/arch/mac68k/md.c Mon May 11 12:57:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.3 2015/05/10 10:14:03 martin Exp $ */
+/*     $NetBSD: md.c,v 1.4 2015/05/11 12:57:55 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -239,7 +239,7 @@
 md_make_bsd_partitions(void)
 {
        FILE *f;
-       int i, j, pl;
+       int i, j, pl, rv;
        EBZB *bzb;
 
        /*
@@ -250,10 +250,10 @@
         */
        while (1) {
            if (check_for_errors()) {
-               process_menu (MENU_sanity, NULL);
-               if (yesno < 0)
+               process_menu (MENU_sanity, &rv);
+               if (rv < 0)
                    return 0;
-               else if (yesno)
+               else if (rv)
                    break;
                edit_diskmap();
            } else
@@ -1166,7 +1166,7 @@
 {
        char buf[96], type;
        char fstyp[16], use[16], name[64];
-       int i, j;
+       int i, j, rv;
        EBZB *bzb;
 
        msg_clear();
@@ -1187,9 +1187,9 @@
                map.blk[i].pmPyPartStart, fstyp, use, name);
            msg_table_add(MSG_dump_line, buf);
        }
-       process_menu(MENU_okabort, NULL);
+       process_menu(MENU_okabort, &rv);
        msg_clear();
-       return(yesno);
+       return rv;
 }
 #endif /* MD_DEBUG_SORT_MERGE */
 
diff -r abd25e8c123a -r 457730974cb3 usr.sbin/sysinst/arch/mac68k/menus.md.de
--- a/usr.sbin/sysinst/arch/mac68k/menus.md.de  Mon May 11 10:43:10 2015 +0000
+++ b/usr.sbin/sysinst/arch/mac68k/menus.md.de  Mon May 11 12:57:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.md.de,v 1.2 2014/08/03 16:09:40 martin Exp $     */
+/*     $NetBSD: menus.md.de,v 1.3 2015/05/11 12:57:55 martin Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -152,8 +152,8 @@
        option "OK", exit, action { };
 
 menu okabort, title "Was möchten Sie?", y=17;
-       option "Fortfahren", exit, action { yesno = 1; };
-       option "Installation abbrechen", exit, action { yesno = 0; };
+       option "Fortfahren", exit, action { *((int*)arg) = 1; };
+       option "Installation abbrechen", exit, action { *((int*)arg) = 0; };
 
 menu chooseid, title  "Partitionstyp?";
        option "NetBSD Root", exit, action {
@@ -321,9 +321,9 @@
 menu sanity, title "Bitte wählen Sie";
        display action {msg_display (MSG_sanity_check);
                report_errors(); };
-       option "Installation abbrechen", exit, action {yesno = -1; };
-       option "Warnungen ignorieren und fortfahren", exit, action {yesno = 1;};
-       option "Festplatten Partitions Übersicht erneut ändern", exit, action {yesno = 0; };
+       option "Installation abbrechen", exit, action { *((int*)arg) = -1; };
+       option "Warnungen ignorieren und fortfahren", exit, action { *((int*)arg) = 1;};
+       option "Festplatten Partitions Übersicht erneut ändern", exit, action { *((int*)arg) = 0; };
 
 /*
  * This menu shouldn't be used in the mac68k port, but it needs to be
diff -r abd25e8c123a -r 457730974cb3 usr.sbin/sysinst/arch/mac68k/menus.md.en
--- a/usr.sbin/sysinst/arch/mac68k/menus.md.en  Mon May 11 10:43:10 2015 +0000
+++ b/usr.sbin/sysinst/arch/mac68k/menus.md.en  Mon May 11 12:57:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.md.en,v 1.2 2014/08/03 16:09:40 martin Exp $     */
+/*     $NetBSD: menus.md.en,v 1.3 2015/05/11 12:57:55 martin Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -152,8 +152,8 @@
        option "OK", exit, action { };
 
 menu okabort, title "What do you want to do?", y=17;
-       option "Continue", exit, action { yesno = 1; };
-       option "Abort install", exit, action { yesno = 0; };
+       option "Continue", exit, action { *((int*)arg) = 1; };
+       option "Abort install", exit, action { *((int*)arg) = 0; };
 
 menu chooseid, title  "Partition Type?";
        option "NetBSD Root", exit, action {
@@ -321,9 +321,9 @@
 menu sanity, title "Choose an option";
        display action {msg_display (MSG_sanity_check);
                report_errors(); };
-       option "Abort installation", exit, action {yesno = -1; };
-       option "Ignore warnings and continue", exit, action {yesno = 1;};
-       option "Re-edit Disk Partition Map", exit, action {yesno = 0; };
+       option "Abort installation", exit, action { *((int*)arg) = -1; };
+       option "Ignore warnings and continue", exit, action { *((int*)arg) = 1;};
+       option "Re-edit Disk Partition Map", exit, action { *((int*)arg) = 0; };
 
 /*
  * This menu shouldn't be used in the mac68k port, but it needs to be
diff -r abd25e8c123a -r 457730974cb3 usr.sbin/sysinst/arch/mac68k/menus.md.es
--- a/usr.sbin/sysinst/arch/mac68k/menus.md.es  Mon May 11 10:43:10 2015 +0000
+++ b/usr.sbin/sysinst/arch/mac68k/menus.md.es  Mon May 11 12:57:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.md.es,v 1.2 2014/08/03 16:09:40 martin Exp $     */
+/*     $NetBSD: menus.md.es,v 1.3 2015/05/11 12:57:55 martin Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -152,8 +152,8 @@
        option "OK", exit, action { };
 
 menu okabort, title "¿Que quiere hacer?", y=17;
-       option "Continuar", exit, action { yesno = 1; };
-       option "Abortar instalacion", exit, action { yesno = 0; };
+       option "Continuar", exit, action { *((int*)arg) = 1; };
+       option "Abortar instalacion", exit,  { *((int*)arg) = 0; };
 
 menu chooseid, title  "¿Tipo de particion?";
        option "NetBSD Root", exit, action {
@@ -321,9 +321,9 @@
 menu sanity, title "Escoja una opcion";
        display action {msg_display (MSG_sanity_check);
                report_errors(); };
-       option "Abortar instalacion", exit, action {yesno = -1; };
-       option "Ignorar avisos y continuar", exit, action {yesno = 1;};
-       option "Re-editar Mapa de Particiones de Disco", exit, action {yesno = 0; };
+       option "Abortar instalacion", exit, action { *((int*)arg) = -1; };
+       option "Ignorar avisos y continuar", exit, action { *((int*)arg) = 1;};
+       option "Re-editar Mapa de Particiones de Disco", exit, action { *((int*)arg) = 0; };
 
 /*
  * This menu shouldn't be used in the mac68k port, but it needs to be
diff -r abd25e8c123a -r 457730974cb3 usr.sbin/sysinst/arch/mac68k/menus.md.pl
--- a/usr.sbin/sysinst/arch/mac68k/menus.md.pl  Mon May 11 10:43:10 2015 +0000
+++ b/usr.sbin/sysinst/arch/mac68k/menus.md.pl  Mon May 11 12:57:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: menus.md.pl,v 1.2 2014/08/03 16:09:40 martin Exp $     */
+/*     $NetBSD: menus.md.pl,v 1.3 2015/05/11 12:57:55 martin Exp $     */
 /*     Based on english version: */
 /*     NetBSD: menus.md.en,v 1.13 2001/11/29 23:20:58 thorpej Exp      */
 
@@ -154,8 +154,8 @@
        option "OK", exit, action { };
 
 menu okabort, title "Co chcesz zrobic?";
-       option "OK", exit, action { yesno = 1; };
-       option "Przerwac instalacje", exit, action { yesno = 0; };
+       option "OK", exit, action { *((int*)arg) = 1; };
+       option "Przerwac instalacje", exit, action { *((int*)arg) = 0; };
 
 menu chooseid, title  "Rodzaj partycji?";
        option "NetBSD Root", exit, action {
@@ -323,9 +323,9 @@
 menu sanity, title "Wybierz opcje";
        display action {msg_display (MSG_sanity_check);
                report_errors(); };
-       option "Przerwij instalacje", exit, action {yesno = -1; };
-       option "Zignoruj ostrzezenia i kontynuuj", exit, action {yesno = 1;};
-       option "Ponownie wyedytuj mape partycji dysku", exit, action {yesno = 0; };
+       option "Przerwij instalacje", exit, action { *((int*)arg) = -1; };
+       option "Zignoruj ostrzezenia i kontynuuj", exit, action { *((int*)arg) = 1;};
+       option "Ponownie wyedytuj mape partycji dysku", exit, action { *((int*)arg) = 0; };
 
 /*
  * This menu shouldn't be used in the mac68k port, but it needs to be