Remove remaining traces of d_boot[01]
This commit is contained in:
parent
051ab09117
commit
4805ff9a48
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=93809
@ -161,25 +161,7 @@ struct disklabel {
|
|||||||
u_int16_t d_type; /* drive type */
|
u_int16_t d_type; /* drive type */
|
||||||
u_int16_t d_subtype; /* controller/d_type specific */
|
u_int16_t d_subtype; /* controller/d_type specific */
|
||||||
char d_typename[16]; /* type name, e.g. "eagle" */
|
char d_typename[16]; /* type name, e.g. "eagle" */
|
||||||
|
char d_packname[16]; /* pack identifier */
|
||||||
/*
|
|
||||||
* d_packname contains the pack identifier and is returned when
|
|
||||||
* the disklabel is read off the disk or in-core copy.
|
|
||||||
* d_boot0 and d_boot1 are the (optional) names of the
|
|
||||||
* primary (block 0) and secondary (block 1-15) bootstraps
|
|
||||||
* as found in /boot. These are returned when using
|
|
||||||
* getdiskbyname(3) to retrieve the values from /etc/disktab.
|
|
||||||
*/
|
|
||||||
union {
|
|
||||||
char un_d_packname[16]; /* pack identifier */
|
|
||||||
struct {
|
|
||||||
char *un_d_boot0; /* primary bootstrap name */
|
|
||||||
char *un_d_boot1; /* secondary bootstrap name */
|
|
||||||
} un_b;
|
|
||||||
} d_un;
|
|
||||||
#define d_packname d_un.un_d_packname
|
|
||||||
#define d_boot0 d_un.un_b.un_d_boot0
|
|
||||||
#define d_boot1 d_un.un_b.un_d_boot1
|
|
||||||
|
|
||||||
/* disk geometry: */
|
/* disk geometry: */
|
||||||
u_int32_t d_secsize; /* # of bytes per sector */
|
u_int32_t d_secsize; /* # of bytes per sector */
|
||||||
|
@ -1625,8 +1625,6 @@ getvirginlabel(void)
|
|||||||
return (NULL);
|
return (NULL);
|
||||||
out:
|
out:
|
||||||
close(f);
|
close(f);
|
||||||
lab.d_boot0 = NULL;
|
|
||||||
lab.d_boot1 = NULL;
|
|
||||||
return (&lab);
|
return (&lab);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -161,25 +161,7 @@ struct disklabel {
|
|||||||
u_int16_t d_type; /* drive type */
|
u_int16_t d_type; /* drive type */
|
||||||
u_int16_t d_subtype; /* controller/d_type specific */
|
u_int16_t d_subtype; /* controller/d_type specific */
|
||||||
char d_typename[16]; /* type name, e.g. "eagle" */
|
char d_typename[16]; /* type name, e.g. "eagle" */
|
||||||
|
char d_packname[16]; /* pack identifier */
|
||||||
/*
|
|
||||||
* d_packname contains the pack identifier and is returned when
|
|
||||||
* the disklabel is read off the disk or in-core copy.
|
|
||||||
* d_boot0 and d_boot1 are the (optional) names of the
|
|
||||||
* primary (block 0) and secondary (block 1-15) bootstraps
|
|
||||||
* as found in /boot. These are returned when using
|
|
||||||
* getdiskbyname(3) to retrieve the values from /etc/disktab.
|
|
||||||
*/
|
|
||||||
union {
|
|
||||||
char un_d_packname[16]; /* pack identifier */
|
|
||||||
struct {
|
|
||||||
char *un_d_boot0; /* primary bootstrap name */
|
|
||||||
char *un_d_boot1; /* secondary bootstrap name */
|
|
||||||
} un_b;
|
|
||||||
} d_un;
|
|
||||||
#define d_packname d_un.un_d_packname
|
|
||||||
#define d_boot0 d_un.un_b.un_d_boot0
|
|
||||||
#define d_boot1 d_un.un_b.un_d_boot1
|
|
||||||
|
|
||||||
/* disk geometry: */
|
/* disk geometry: */
|
||||||
u_int32_t d_secsize; /* # of bytes per sector */
|
u_int32_t d_secsize; /* # of bytes per sector */
|
||||||
|
@ -1625,8 +1625,6 @@ getvirginlabel(void)
|
|||||||
return (NULL);
|
return (NULL);
|
||||||
out:
|
out:
|
||||||
close(f);
|
close(f);
|
||||||
lab.d_boot0 = NULL;
|
|
||||||
lab.d_boot1 = NULL;
|
|
||||||
return (&lab);
|
return (&lab);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user