summaryrefslogtreecommitdiff
path: root/sbin/pdisk
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2016-01-17 16:34:42 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2016-01-17 16:34:42 +0000
commitc32dcb782c5a42cca8aede5c7568da37d250c1f4 (patch)
tree18977ab28f432b1cb0eacb25277cc32cf3c9124f /sbin/pdisk
parent541799b37400b015408f9595e3b4e3f3d23dfe0e (diff)
The great de-typedef'ification continues. OSType -> unsigned long.
Nuke names/NAMES as the only use was in an unused array of abbreviations which also goes.
Diffstat (limited to 'sbin/pdisk')
-rw-r--r--sbin/pdisk/dump.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/sbin/pdisk/dump.c b/sbin/pdisk/dump.c
index 4e3a01a1f3d..491fb9c6af6 100644
--- a/sbin/pdisk/dump.c
+++ b/sbin/pdisk/dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump.c,v 1.26 2016/01/17 16:26:26 krw Exp $ */
+/* $OpenBSD: dump.c,v 1.27 2016/01/17 16:34:41 krw Exp $ */
//
// dump.c - dumping partition maps
@@ -58,15 +58,9 @@
//
// Types
//
-typedef struct names {
- const char *abbr;
- const char *full;
-} NAMES;
-
-typedef unsigned long OSType;
typedef struct PatchDescriptor {
- OSType patchSig;
+ unsigned long patchSig;
unsigned short majorVers;
unsigned short minorVers;
unsigned long flags;
@@ -90,19 +84,6 @@ typedef PatchList *PatchListPtr;
//
// Global Constants
//
-NAMES plist[] = {
- {"Drvr", "Apple_Driver"},
- {"Drv4", "Apple_Driver43"},
- {"Free", "Apple_Free"},
- {"Patc", "Apple_Patches"},
- {" HFS", "Apple_HFS"},
- {" MFS", "Apple_MFS"},
- {"PDOS", "Apple_PRODOS"},
- {"junk", "Apple_Scratch"},
- {"unix", "Apple_UNIX_SVR2"},
- {" map", "Apple_partition_map"},
- {0, 0},
-};
const char * kStringEmpty = "";
const char * kStringNot = " not";