summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/pdisk/file_media.c4
-rw-r--r--sbin/pdisk/io.c8
-rw-r--r--sbin/pdisk/partition_map.c4
-rw-r--r--sbin/pdisk/validate.c8
4 files changed, 10 insertions, 14 deletions
diff --git a/sbin/pdisk/file_media.c b/sbin/pdisk/file_media.c
index d3144c86698..e107faa2325 100644
--- a/sbin/pdisk/file_media.c
+++ b/sbin/pdisk/file_media.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file_media.c,v 1.12 2016/01/11 07:54:07 jasper Exp $ */
+/* $OpenBSD: file_media.c,v 1.13 2016/01/11 07:57:54 jasper Exp $ */
/*
* file_media.c -
@@ -190,7 +190,7 @@ open_file_as_media(char *file, int oflag)
int fd;
loff_t off;
struct stat info;
-
+
if (file_inited == 0) {
file_init();
}
diff --git a/sbin/pdisk/io.c b/sbin/pdisk/io.c
index f0a6aee45b2..587716be99c 100644
--- a/sbin/pdisk/io.c
+++ b/sbin/pdisk/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.9 2016/01/11 07:54:07 jasper Exp $ */
+/* $OpenBSD: io.c,v 1.10 2016/01/11 07:57:54 jasper Exp $ */
//
// io.c - simple io and input parsing routines
@@ -108,7 +108,6 @@ my_ungetch(int c)
}
}
-
void
flush_to_newline(int keep_newline)
{
@@ -162,7 +161,6 @@ get_okay(const char *prompt, int default_value)
return -1;
}
-
int
get_command(const char *prompt, int promptBeforeGet, int *command)
{
@@ -170,7 +168,7 @@ get_command(const char *prompt, int promptBeforeGet, int *command)
if (promptBeforeGet) {
printf(prompt);
- }
+ }
for (;;) {
c = my_getch();
@@ -188,7 +186,6 @@ get_command(const char *prompt, int promptBeforeGet, int *command)
return 0;
}
-
int
get_number_argument(const char *prompt, long *number, long default_value)
{
@@ -267,7 +264,6 @@ get_number(int first_char)
return(ret_value);
}
-
int
get_string_argument(const char *prompt, char **string, int reprompt)
{
diff --git a/sbin/pdisk/partition_map.c b/sbin/pdisk/partition_map.c
index 167fd25d2aa..c51f4688c74 100644
--- a/sbin/pdisk/partition_map.c
+++ b/sbin/pdisk/partition_map.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: partition_map.c,v 1.10 2016/01/11 07:54:07 jasper Exp $ */
+/* $OpenBSD: partition_map.c,v 1.11 2016/01/11 07:57:54 jasper Exp $ */
//
// partition_map.c - partition map routines
@@ -543,7 +543,7 @@ create_partition_map(char *name, partition_map_header *oldmap)
// got it!
coerce_block0(map);
sync_device_size(map);
-
+
data = calloc(1, PBLOCK_SIZE);
if (data == NULL) {
error(errno, "can't allocate memory for disk buffers");
diff --git a/sbin/pdisk/validate.c b/sbin/pdisk/validate.c
index 525beff8bf8..e65590b7cb8 100644
--- a/sbin/pdisk/validate.c
+++ b/sbin/pdisk/validate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: validate.c,v 1.7 2016/01/11 07:54:07 jasper Exp $ */
+/* $OpenBSD: validate.c,v 1.8 2016/01/11 07:57:54 jasper Exp $ */
//
// validate.c -
@@ -228,7 +228,7 @@ add_range(range_list **list, u32 base, u32 len, int allocate)
}
cur->next = item;
item->prev = cur;
-
+
cur->end = high;
}
@@ -421,7 +421,7 @@ check_map:
goto post_processing;
}
printed = 0;
-
+
// signature matches
if (mb->dpme_signature != DPME_SIGNATURE) {
printed = 1;
@@ -449,7 +449,7 @@ check_map:
}
// remember stuff for post processing
add_range(&list, mb->dpme_pblock_start, mb->dpme_pblocks, 1);
-
+
// XXX type is known type?
// XXX no unknown flags?
// XXX boot blocks either within or outside of logical