summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2015-03-27 16:06:00 +0000
committerkrw <krw@openbsd.org>2015-03-27 16:06:00 +0000
commitba49db25697396265be460763a10c3c7cdfd965f (patch)
tree80ce34e4e820be13017732d2e61babc5d87f6b57
parentUse DOSACTIVE define instead of magic number 0x80. (diff)
downloadwireguard-openbsd-ba49db25697396265be460763a10c3c7cdfd965f.tar.xz
wireguard-openbsd-ba49db25697396265be460763a10c3c7cdfd965f.zip
Wrap some annoying long lines.
-rw-r--r--sbin/fdisk/disk.c5
-rw-r--r--sbin/fdisk/part.c17
2 files changed, 14 insertions, 8 deletions
diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c
index cbea7fd3c47..de9fd77c85e 100644
--- a/sbin/fdisk/disk.c
+++ b/sbin/fdisk/disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.c,v 1.45 2015/03/16 23:51:50 krw Exp $ */
+/* $OpenBSD: disk.c,v 1.46 2015/03/27 16:06:00 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -47,7 +47,8 @@ DISK_open(char *disk, int mode)
if (fstat(fd, &st) == -1)
err(1, "%s", disk);
if (!S_ISCHR(st.st_mode) && !S_ISREG(st.st_mode))
- errx(1, "%s is not a character device or a regular file", disk);
+ errx(1, "%s is not a character device or a regular file",
+ disk);
return (fd);
}
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c
index ac9091328fd..1ad2a85f5b9 100644
--- a/sbin/fdisk/part.c
+++ b/sbin/fdisk/part.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: part.c,v 1.71 2015/03/27 15:56:45 krw Exp $ */
+/* $OpenBSD: part.c,v 1.72 2015/03/27 16:06:00 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -249,7 +249,8 @@ PRT_make(struct prt *partn, off_t offset, off_t reloff,
} else {
/* should this really keep flag, id and set others to 0xff? */
memset(prt, 0xFF, sizeof(*prt));
- printf("Warning CHS values out of bounds only saving LBA values\n");
+ printf("Warning CHS values out of bounds only saving "
+ "LBA values\n");
}
prt->dp_flag = partn->flag & 0xFF;
@@ -273,13 +274,17 @@ PRT_print(int num, struct prt *partn, char *units)
i = unit_lookup(units);
if (partn == NULL) {
- printf(" Starting Ending LBA Info:\n");
- printf(" #: id C H S - C H S [ start: size ]\n");
- printf("-------------------------------------------------------------------------------\n");
+ printf(" Starting Ending "
+ " LBA Info:\n");
+ printf(" #: id C H S - C H S "
+ "[ start: size ]\n");
+ printf("---------------------------------------"
+ "----------------------------------------\n");
} else {
size = ((double)partn->ns * unit_types[SECTORS].conversion) /
unit_types[i].conversion;
- printf("%c%1d: %.2X %6u %3u %3u - %6u %3u %3u [%12llu:%12.0f%s] %s\n",
+ printf("%c%1d: %.2X %6u %3u %3u - %6u %3u %3u "
+ "[%12llu:%12.0f%s] %s\n",
(partn->flag == DOSACTIVE)?'*':' ',
num, partn->id,
partn->scyl, partn->shead, partn->ssect,