diff options
| author | nyan <nyan@FreeBSD.org> | 2005-04-13 13:42:38 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2005-04-13 13:42:38 +0000 |
| commit | db5f8a5b7b8a9274209304aff82f7656102e2034 (patch) | |
| tree | 9dd3bd6e6a9024fbb70f441f50b3ab01d599989c /lib/libdisk/disk.c | |
| parent | 428e5e3f08e35e52dafd27c30a256f5d254148db (diff) | |
| download | FreeBSD-src-db5f8a5b7b8a9274209304aff82f7656102e2034.zip FreeBSD-src-db5f8a5b7b8a9274209304aff82f7656102e2034.tar.gz | |
Merge two slice_type_name() functions.
Diffstat (limited to 'lib/libdisk/disk.c')
| -rw-r--r-- | lib/libdisk/disk.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c index 7381457..4f21cad 100644 --- a/lib/libdisk/disk.c +++ b/lib/libdisk/disk.c @@ -324,28 +324,6 @@ Set_Boot_Blocks(struct disk *d, const u_char *b1, const u_char *b2) return 0; } -#ifdef PC98 -const char * -slice_type_name( int type, int subtype ) -{ - - switch (type) { - case whole: - return "whole"; - case fat: - return "fat"; - case freebsd: - switch (subtype) { - case 0xc494: return "freebsd"; - default: return "unknown"; - } - case unused: - return "unused"; - default: - return "unknown"; - } -} -#else /* PC98 */ const char * slice_type_name( int type, int subtype ) { @@ -392,7 +370,11 @@ slice_type_name( int type, int subtype ) return "fat"; case freebsd: switch (subtype) { +#ifdef PC98 + case 0xc494: return "freebsd"; +#else case 165: return "freebsd"; +#endif default: return "unknown"; } case extended: @@ -407,4 +389,3 @@ slice_type_name( int type, int subtype ) return "unknown"; } } -#endif /* PC98 */ |
