[src/trunk]: src/distrib/utils/sysinst/arch/mac68k Make this compile again.

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

details:   https://anonhg.NetBSD.org/src/rev/724905b1f6ae
branches:  trunk
changeset: 471956:724905b1f6ae
user:      ender <ender%NetBSD.org@localhost>
date:      Fri Apr 16 08:29:15 1999 +0000

description:
Make this compile again.

diffstat:

 distrib/utils/sysinst/arch/mac68k/md.c |  50 +++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diffs (105 lines):

diff -r 8dd2c71ea076 -r 724905b1f6ae distrib/utils/sysinst/arch/mac68k/md.c
--- a/distrib/utils/sysinst/arch/mac68k/md.c    Fri Apr 16 07:24:13 1999 +0000
+++ b/distrib/utils/sysinst/arch/mac68k/md.c    Fri Apr 16 08:29:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.c,v 1.4 1999/04/09 10:43:59 bouyer Exp $ */
+/*     $NetBSD: md.c,v 1.5 1999/04/16 08:29:15 ender Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -614,7 +614,7 @@
        /*
         * Setup the disktype so /etc/disktab gets proper info
         */
-       if (strncmp (disk->name, "sd", 2) == 0) {
+       if (strncmp (disk->dd_name, "sd", 2) == 0) {
            disktype = "SCSI";
            doessf = "sf:";
        }
@@ -754,11 +754,11 @@
         *  start by setting everything to unused.
         */
        for (i=0;i<MAXPARTITIONS;i++) {
-           bsdlabel[i][D_SIZE] = 0;
-           bsdlabel[i][D_OFFSET] = 0;
-           bsdlabel[i][D_FSTYPE] = T_UNUSED;
-           bsdlabel[i][D_BSIZE] = 0;
-           bsdlabel[i][D_FSIZE] = 0;
+           bsdlabel[i].pi_size = 0;
+           bsdlabel[i].pi_offset = 0;
+           bsdlabel[i].pi_fstype = FS_UNUSED;
+           bsdlabel[i].pi_bsize = 0;
+           bsdlabel[i].pi_fsize = 0;
            fsmount[i][0] = '\0';
        }
        /*
@@ -772,17 +772,17 @@
                pl = bzb->flags.part - 'a';
                switch (part_type(j, fstyp, use, name)) {
                    case TYP_HFS:
-                       bsdlabel[pl][D_FSTYPE] = T_MSDOS;  /* really MacOS */
+                       bsdlabel[pl].pi_fstype = FS_HFS; 
                        strcpy (fsmount[pl], bzb->mount_point);
                        break;
                    case TYP_BSD:
                        switch (bzb->type) {
                            case BZB_TYPEFS:
-                               bsdlabel[pl][D_FSTYPE] = T_42BSD;
+                               bsdlabel[pl].pi_fstype = FS_BSDFFS;
                                strcpy (fsmount[pl], bzb->mount_point);
                                break;
                            case BZB_TYPESWAP:
-                               bsdlabel[pl][D_FSTYPE] = T_SWAP;
+                               bsdlabel[pl].pi_fstype = FS_SWAP;
                                break;
                            default:
                                break;
@@ -791,12 +791,12 @@
                    default:
                        break;
                }
-               if (bsdlabel[pl][D_FSTYPE] != T_UNUSED) {
-                   bsdlabel[pl][D_SIZE] = map.blk[j].pmPartBlkCnt;
-                   bsdlabel[pl][D_OFFSET] = map.blk[j].pmPyPartStart;
-                   if (bsdlabel[pl][D_FSTYPE] != T_SWAP) {
-                       bsdlabel[pl][D_BSIZE] = 8192;
-                       bsdlabel[pl][D_FSIZE] = 1024;
+               if (bsdlabel[pl].pi_fstype != FS_UNUSED) {
+                   bsdlabel[pl].pi_size = map.blk[j].pmPartBlkCnt;
+                   bsdlabel[pl].pi_offset = map.blk[j].pmPyPartStart;
+                   if (bsdlabel[pl].pi_fstype != FS_SWAP) {
+                       bsdlabel[pl].pi_bsize = 8192;
+                       bsdlabel[pl].pi_fsize = 1024;
                    }
                }
            }
@@ -823,20 +823,20 @@
        (void)fprintf (f, "\t:sc#%d:su#%d:\\\n", dlhead*dlsec, dlsize);
        (void)fprintf (f, "\t:se#%d:%s\\\n", bsize, doessf);
        for (i=0; i<8; i++) {
-               if (bsdlabel[i][D_FSTYPE] == T_MSDOS)
+               if (bsdlabel[i].pi_fstype == FS_HFS)
                    (void)fprintf (f, "\t:p%c#%d:o%c#%d:t%c=macos:",
-                              'a'+i, bsdlabel[i][D_SIZE],
-                              'a'+i, bsdlabel[i][D_OFFSET],
+                              'a'+i, bsdlabel[i].pi_size,
+                              'a'+i, bsdlabel[i].pi_offset,
                               'a'+i);
                else
                    (void)fprintf (f, "\t:p%c#%d:o%c#%d:t%c=%s:",
-                              'a'+i, bsdlabel[i][D_SIZE],
-                              'a'+i, bsdlabel[i][D_OFFSET],
-                              'a'+i, fstype[bsdlabel[i][D_FSTYPE]]);
-               if (bsdlabel[i][D_FSTYPE] == T_42BSD)
+                              'a'+i, bsdlabel[i].pi_size,
+                              'a'+i, bsdlabel[i].pi_offset,
+                              'a'+i, fstypenames[bsdlabel[i].pi_fstype]);
+               if (bsdlabel[i].pi_fstype == FS_BSDFFS)
                        (void)fprintf (f, "b%c#%d:f%c#%d",
-                                      'a'+i, bsdlabel[i][D_BSIZE],
-                                      'a'+i, bsdlabel[i][D_FSIZE]);
+                                      'a'+i, bsdlabel[i].pi_bsize,
+                                      'a'+i, bsdlabel[i].pi_fsize);
                if (i < 7)
                        (void)fprintf (f, "\\\n");
                else