summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Uzel2011-09-19 15:29:10 +0200
committerKarel Zak2011-09-27 15:23:58 +0200
commitbb92c8ea2d1a0a7cfc182679c32acd75f0343f4b (patch)
tree98c9a43471a1e854ef0b8398a32a42529074bb3e
parentsfdisk: file descriptor is of int type (diff)
downloadkernel-qcow2-util-linux-bb92c8ea2d1a0a7cfc182679c32acd75f0343f4b.tar.gz
kernel-qcow2-util-linux-bb92c8ea2d1a0a7cfc182679c32acd75f0343f4b.tar.xz
kernel-qcow2-util-linux-bb92c8ea2d1a0a7cfc182679c32acd75f0343f4b.zip
sfdisk: fix weird indentation in msdos_partition()
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
-rw-r--r--fdisk/sfdisk.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 81a50ee78..2c9de8f32 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -1550,14 +1550,13 @@ msdos_partition(char *dev, int fd, unsigned long start, struct disk_desc *z) {
do_warn(_("detected Disk Manager - unable to handle that\n"));
return 0;
}
- {
- unsigned int sig = *(unsigned short *)(s->data + 2);
- if (sig <= 0x1ae
- && *(unsigned short *)(s->data + sig) == 0x55aa
- && (1 & *(unsigned char *)(s->data + sig + 2))) {
+
+ unsigned int sig = *(unsigned short *)(s->data + 2);
+ if (sig <= 0x1ae
+ && *(unsigned short *)(s->data + sig) == 0x55aa
+ && (1 & *(unsigned char *)(s->data + sig + 2))) {
do_warn(_("DM6 signature found - giving up\n"));
return 0;
- }
}
for (pno = 0; pno < 4; pno++, cp += sizeof(struct partition)) {