diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-01-17 16:44:02 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-01-17 16:44:02 +0000 |
| commit | 077e685ad8f4cdf41568944eee4eb55e2363db8b (patch) | |
| tree | 216cd776282250a6511159c61b0faa39c8e8858a | |
| parent | c32dcb782c5a42cca8aede5c7568da37d250c1f4 (diff) | |
The great de-typedef'ification continues.
PatchList -> struct patchlist
Nuke PatchListPtr
PatchListDescriptor -> struct patchlistdescriptor
Nuke PatchListDescriptorPtr
| -rw-r--r-- | sbin/pdisk/dump.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/sbin/pdisk/dump.c b/sbin/pdisk/dump.c index 491fb9c6af6..745d4f4b70e 100644 --- a/sbin/pdisk/dump.c +++ b/sbin/pdisk/dump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dump.c,v 1.27 2016/01/17 16:34:41 krw Exp $ */ +/* $OpenBSD: dump.c,v 1.28 2016/01/17 16:44:01 krw Exp $ */ // // dump.c - dumping partition maps @@ -59,7 +59,7 @@ // Types // -typedef struct PatchDescriptor { +struct patchdescriptor { unsigned long patchSig; unsigned short majorVers; unsigned short minorVers; @@ -70,15 +70,13 @@ typedef struct PatchDescriptor { unsigned long patchDescriptorLen; unsigned char patchName[33]; unsigned char patchVendor[1]; -} PatchDescriptor; -typedef PatchDescriptor * PatchDescriptorPtr; +}; -typedef struct PatchList { +struct patchlist { unsigned short numPatchBlocks; // number of disk blocks to hold the patch list unsigned short numPatches; // number of patches in list - PatchDescriptor thePatch[1]; -} PatchList; -typedef PatchList *PatchListPtr; + struct patchdescriptor thePatch[1]; +}; // @@ -509,8 +507,8 @@ display_patches(partition_map *entry) long long offset; struct file_media *m; static unsigned char *patch_block; - PatchListPtr p; - PatchDescriptorPtr q; + struct patchlist *p; + struct patchdescriptor *q; unsigned char *next; unsigned char *s; int i; @@ -529,7 +527,7 @@ display_patches(partition_map *entry) warn("Can't read patch block"); return; } - p = (PatchListPtr) patch_block; + p = (struct patchlist *) patch_block; if (p->numPatchBlocks != 1) { i = p->numPatchBlocks; free(patch_block); @@ -547,7 +545,7 @@ display_patches(partition_map *entry) return; } } - p = (PatchListPtr) patch_block; + p = (struct patchlist *) patch_block; } printf("Patch list (%d entries)\n", p->numPatches); q = p->thePatch; @@ -566,7 +564,7 @@ display_patches(partition_map *entry) printf("remainder of entry -"); dump_block(s, next-s); } - q = (PatchDescriptorPtr)next; + q = (struct patchdescriptor *)next; } } |