[src/trunk]: src/usr.bin/kdump Change code to use a switch statement, and add...

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

details:   https://anonhg.NetBSD.org/src/rev/aa58c2fed011
branches:  trunk
changeset: 566476:aa58c2fed011
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 10 15:25:57 2004 +0000

description:
Change code to use a switch statement, and add exceptions to fix the
conflicts.

XXX: Fix the conflicts.

1. chio: change to 'x' from 'c' so that it does not conflict with cdio.
   keep the 'c' ioctls in the driver for compat.
2. ppp/slip: change SLCGUNIT to some other number and accept the old number
   in the driver.
3. ipf: [3 instances] Have darren fix them.

diffstat:

 usr.bin/kdump/mkioctls |  24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r 34b626318746 -r aa58c2fed011 usr.bin/kdump/mkioctls
--- a/usr.bin/kdump/mkioctls    Mon May 10 15:14:12 2004 +0000
+++ b/usr.bin/kdump/mkioctls    Mon May 10 15:25:57 2004 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mkioctls,v 1.15 2004/05/08 21:03:43 jmc Exp $
+#      $NetBSD: mkioctls,v 1.16 2004/05/10 15:25:57 christos Exp $
 #
 # Copyright (c) 1994
 #      The Regents of the University of California.  All rights reserved.
@@ -34,6 +34,7 @@
 #
 #      @(#)mkioctls    8.2 (Berkeley) 4/28/95
 #
+echo "/* Automatically generated file, do not edit! */"
 echo "#define const"   # XXX: timepps lossage
 echo "struct ap_control { int _xxx; };" # XXX: ip_nat.h lossage
 echo "#define COMPAT_43"
@@ -45,6 +46,7 @@
 echo "#include <sys/disk.h>"
 echo "#include <sys/mount.h>"
 echo "#include <sys/termios.h>"
+echo "#include <sys/disklabel.h>"
 echo "#include <net/if.h>"
 echo "#include <net/route.h>"
 echo "#include <net/ppp_defs.h>"
@@ -60,8 +62,14 @@
        echo "#include <$i>"
 done | sed -e "s,${DESTDIR}/usr/include/,,g"
 
-${CC:-cc} -E -nostdinc -idirafter $DESTDIR/usr/include -dM ${1+"$@"} | awk '
+${CC:-cc} -E -nostdinc -idirafter $DESTDIR/usr/include -dM ${1+"$@"} | tee sourcefile | awk '
 BEGIN {
+       keep["SLIOCGUNIT"] = 1; /* Same as PPPIOCGASYNCMAP */
+       keep["SIOCRMNAT"] = 1;  /* Same as SIOCRMAFR */
+       keep["SIOCADNAT"] = 1;  /* Same as SIOCADAFR */
+       keep["SIOCDELST"] = 1;  /* Same as SIOCRMNAT */
+       keep["CHIOGPICKER"] = 1; /* Same as CDIOREADTOCHEADER */
+
        print ""
        print "char *ioctlname __P((long));"
        print ""
@@ -70,9 +78,10 @@
        print "\tlong val;"
        print "{"
        print ""
+       print "\tswitch (val) {\n"
 }
 
-/^#[   ]*define[       ]*(TIO|FIO|SIO|OSIO|CIO|CRIO)[A-Z]*[    ]*_IO/ {
+/^#[   ]*define[       ]*[A-Z]*IO[A-Z]*[       ]*_IO/ {
        
        # find where the name starts
        for (i = 1; i <= NF; i++)
@@ -80,11 +89,14 @@
                        break;
        ++i;
        # 
-       printf("\tif (val == %s)\n\t\treturn (\"%s\");\n", $i, $i);
-
+       if (keep[$i] != 1) {
+               printf("\tcase %s:\n\t\treturn \"%s\";\n", $i, $i);
+               keep[$i] = 1;
+       }
 }
 END {
-       print "\n\treturn (NULL);"
+       print "\tdefault:\n\t\treturn NULL;\n"
+       print "\t}\n"
        print "}"
 }
 '