diff options
Diffstat (limited to 'sbin/fdisk')
| -rw-r--r-- | sbin/fdisk/part.c | 17 | ||||
| -rw-r--r-- | sbin/fdisk/part.h | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c index d499ca22bcd..61173ff56b0 100644 --- a/sbin/fdisk/part.c +++ b/sbin/fdisk/part.c @@ -1,4 +1,4 @@ -/* $OpenBSD: part.c,v 1.19 2001/03/16 19:02:14 markus Exp $ */ +/* $OpenBSD: part.c,v 1.20 2001/05/18 07:15:18 mickey Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -44,9 +44,10 @@ #include "mbr.h" -static struct part_type { +static const struct part_type { int type; - char *sname; + char sname[14]; + char osname[8]; char *lname; } part_types[] = { { 0x00, "unused ", "unused"}, @@ -129,7 +130,7 @@ PRT_printall() } } -char * +const char * PRT_ascii_id(id) int id; { @@ -262,11 +263,11 @@ PRT_print(num, partn) { if (partn == NULL) { - printf(" Starting Ending\n"); - printf(" #: id cyl hd sec - cyl hd sec [ start - size]\n"); - printf("-------------------------------------------------------------------------\n"); + printf(" Starting Ending\n"); + printf(" #: id cyl hd sec - cyl hd sec [ start - size]\n"); + printf("------------------------------------------------------------------------\n"); } else { - printf("%c%1d: %.2X %4d %3d %3d - %5d %3d %3d [%10d - %10d] %s\n", + printf("%c%1d: %.2X %4d %3d %3d - %4d %3d %3d [%10d - %10d] %s\n", (partn->flag == 0x80)?'*':' ', num, partn->id, partn->scyl, partn->shead, partn->ssect, diff --git a/sbin/fdisk/part.h b/sbin/fdisk/part.h index 4ecd5558a06..d5c7923e0a8 100644 --- a/sbin/fdisk/part.h +++ b/sbin/fdisk/part.h @@ -1,4 +1,4 @@ -/* $OpenBSD: part.h,v 1.6 2000/07/01 21:49:12 mickey Exp $ */ +/* $OpenBSD: part.h,v 1.7 2001/05/18 07:15:18 mickey Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -45,7 +45,7 @@ typedef struct _prt_t { /* Prototypes */ void PRT_printall __P((void)); -char *PRT_ascii_id __P((int)); +const char *PRT_ascii_id __P((int)); void PRT_parse __P((disk_t *, void *, off_t, off_t, prt_t *, int)); void PRT_make __P((prt_t *, off_t, off_t, void *)); void PRT_print __P((int, prt_t *)); |