Shorter names means a few whitespace adjustments.

3 files changed, 18 insertions, 23 deletions

diff --git a/sbin/pdisk/dump.c b/sbin/pdisk/dump.c
index 94d2566345f..7b24b719381 100644
--- a/sbin/pdisk/dump.c
+++ b/sbin/pdisk/dump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump.c,v 1.64 2016/01/29 14:54:38 krw Exp $	*/
+/*	$OpenBSD: dump.c,v 1.65 2016/01/29 15:06:37 krw Exp $	*/
 
 /*
  * dump.c - dumping partition maps
@@ -225,7 +225,7 @@ void
 full_dump_partition_entry(struct partition_map *map, int ix)
 {
 	struct entry *cur;
-	struct dpme    *p;
+	struct dpme *p;
 	int i;
 	uint32_t t;
 
@@ -242,7 +242,7 @@ full_dump_partition_entry(struct partition_map *map, int ix)
 	printf("         logical start: %10u  length: %10u\n",
 	    p->dpme_lblock_start, p->dpme_lblocks);
 
-	printf("                 flags: 0x%x\n", (uint32_t) p->dpme_flags);
+	printf("                 flags: 0x%x\n", (uint32_t)p->dpme_flags);
 	printf("                        ");
 	if (p->dpme_flags & DPME_VALID)
 		printf("valid ");
diff --git a/sbin/pdisk/partition_map.c b/sbin/pdisk/partition_map.c
index 7c85057c260..e683f90e0c7 100644
--- a/sbin/pdisk/partition_map.c
+++ b/sbin/pdisk/partition_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: partition_map.c,v 1.84 2016/01/29 14:54:38 krw Exp $	*/
+/*	$OpenBSD: partition_map.c,v 1.85 2016/01/29 15:06:37 krw Exp $	*/
 
 /*
  * partition_map.c - partition map routines
@@ -53,8 +53,7 @@ enum add_action {
 	kSplit = 2
 };
 
-int		add_data_to_map(struct dpme *, long,
-		    struct partition_map *);
+int		add_data_to_map(struct dpme *, long, struct partition_map *);
 int		coerce_block0(struct partition_map *);
 int		contains_driver(struct entry *);
 void		combine_entry(struct entry *);
diff --git a/sbin/pdisk/partition_map.h b/sbin/pdisk/partition_map.h
index 6e2803a1bf8..d4dc50092b9 100644
--- a/sbin/pdisk/partition_map.h
+++ b/sbin/pdisk/partition_map.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: partition_map.h,v 1.34 2016/01/29 14:54:38 krw Exp $	*/
+/*	$OpenBSD: partition_map.h,v 1.35 2016/01/29 15:06:37 krw Exp $	*/
 
 /*
  * partition_map.h - partition map routines
@@ -46,12 +46,12 @@ struct partition_map {
 };
 
 struct entry {
-    LIST_ENTRY(entry)			disk_entry;
-    LIST_ENTRY(entry)			base_entry;
-    struct partition_map	       *the_map;
-    struct dpme			       *dpme;
-    long				disk_address;
-    int					contains_driver;
+    LIST_ENTRY(entry)		disk_entry;
+    LIST_ENTRY(entry)		base_entry;
+    struct partition_map       *the_map;
+    struct dpme		       *dpme;
+    long			disk_address;
+    int				contains_driver;
 };
 
 extern const char *kFreeType;
@@ -66,20 +66,16 @@ extern int lflag;
 extern int rflag;
 
 struct partition_map	*init_partition_map(char *);
-struct partition_map	*create_partition_map(int, char *, uint64_t,
-    uint32_t);
-struct partition_map	*open_partition_map(int, char *, uint64_t,
-    uint32_t);
+struct partition_map	*create_partition_map(int, char *, uint64_t, uint32_t);
+struct partition_map	*open_partition_map(int, char *, uint64_t, uint32_t);
 
-struct entry		*find_entry_by_disk_address(long,
-    struct partition_map *);
-struct entry		*find_entry_by_type(const char *,
-    struct partition_map *);
-struct entry		*find_entry_by_base(uint32_t,
-    struct partition_map *);
+struct entry	*find_entry_by_disk_address(long, struct partition_map *);
+struct entry	*find_entry_by_type(const char *, struct partition_map *);
+struct entry	*find_entry_by_base(uint32_t, struct partition_map *);
 
 int	add_partition_to_map(const char *, const char *, uint32_t, uint32_t,
     struct partition_map *);
+
 void	free_partition_map(struct partition_map *);
 void	delete_partition_from_map(struct entry *);
 void	move_entry_in_map(long, long, struct partition_map *);