summaryrefslogtreecommitdiff
path: root/sbin/fdisk
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2015-04-02 18:00:56 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2015-04-02 18:00:56 +0000
commit45145daf2459eff0d28f6dc2ba1e2a558e3f1339 (patch)
tree8899864c421061383cf1415286d8cc460ee45782 /sbin/fdisk
parent3f1fc576d7d265f88004ee015eb2183fea769096 (diff)
Don't printf("offset: ...) before every call to MBR_print(). Do it
once inside MBR_print().
Diffstat (limited to 'sbin/fdisk')
-rw-r--r--sbin/fdisk/cmd.c4
-rw-r--r--sbin/fdisk/mbr.c3
-rw-r--r--sbin/fdisk/user.c3
3 files changed, 4 insertions, 6 deletions
diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index dadcfec52ae..19b5e2f9606 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.81 2015/03/26 20:32:10 krw Exp $ */
+/* $OpenBSD: cmd.c,v 1.82 2015/04/02 18:00:55 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -49,7 +49,6 @@ Xreinit(char *args, struct mbr *mbr)
/* Tell em we did something */
printf("In memory copy is initialized to:\n");
- printf("Offset: %lld\t", (long long)mbr->offset);
MBR_print(mbr, args);
printf("Use 'write' to update disk.\n");
@@ -260,7 +259,6 @@ Xprint(char *args, struct mbr *mbr)
{
DISK_printgeometry(args);
- printf("Offset: %lld\t", (long long)mbr->offset);
MBR_print(mbr, args);
return (CMD_CONT);
diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index 352635a5e75..87afd151af5 100644
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbr.c,v 1.51 2015/03/30 17:11:49 krw Exp $ */
+/* $OpenBSD: mbr.c,v 1.52 2015/04/02 18:00:55 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -160,6 +160,7 @@ MBR_print(struct mbr *mbr, char *units)
int i;
/* Header */
+ printf("Offset: %lld\t", (long long)mbr->offset);
printf("Signature: 0x%X\n", (int)mbr->signature);
PRT_print(0, NULL, units);
diff --git a/sbin/fdisk/user.c b/sbin/fdisk/user.c
index 073c099d44b..65d995e9b4e 100644
--- a/sbin/fdisk/user.c
+++ b/sbin/fdisk/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.43 2015/03/26 14:08:12 krw Exp $ */
+/* $OpenBSD: user.c,v 1.44 2015/04/02 18:00:55 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -149,7 +149,6 @@ USER_print_disk(void)
break;
MBR_parse(&dos_mbr, offset, firstoff, &mbr);
- printf("Offset: %lld\t", (long long)offset);
MBR_print(&mbr, NULL);
/* Print out extended partitions too */