summaryrefslogtreecommitdiffstats
path: root/fdisks/fdisk.c
diff options
context:
space:
mode:
authorKarel Zak2013-06-12 17:32:03 +0200
committerKarel Zak2013-06-12 17:39:09 +0200
commit76b86412c607ba47f43ef7c0535436bca2a660d2 (patch)
treec61930713a5d278613a3ab64096c40b69b5b21ac /fdisks/fdisk.c
parenttextual: improve clarity of some error messages (diff)
downloadkernel-qcow2-util-linux-76b86412c607ba47f43ef7c0535436bca2a660d2.tar.gz
kernel-qcow2-util-linux-76b86412c607ba47f43ef7c0535436bca2a660d2.tar.xz
kernel-qcow2-util-linux-76b86412c607ba47f43ef7c0535436bca2a660d2.zip
fdisk: don't use ptes[] in generic code
... the array is MBR specific. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisks/fdisk.c')
-rw-r--r--fdisks/fdisk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 623f16856..33049da18 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -576,7 +576,6 @@ static void delete_partition(struct fdisk_context *cxt, int partnum)
if (partnum < 0 || warn_geometry(cxt))
return;
- ptes[partnum].changed = 1;
if (fdisk_delete_partition(cxt, partnum) != 0)
printf(_("Could not delete partition %d\n"), partnum + 1);
else
@@ -604,7 +603,6 @@ static void change_partition_type(struct fdisk_context *cxt)
continue;
if (fdisk_set_partition_type(cxt, i, t) == 0) {
- ptes[i].changed = 1;
printf (_("Changed type of partition '%s' to '%s'\n"),
org_t ? org_t->name : _("Unknown"),
t ? t->name : _("Unknown"));
@@ -795,8 +793,10 @@ static void print_raw(struct fdisk_context *cxt)
fdisk_is_disklabel(cxt, GPT))
print_buffer(cxt, cxt->firstsector);
- else for (i = 3; i < cxt->label->nparts_max; i++)
+ else if (fdisk_is_disklabel(cxt, DOS)) {
+ for (i = 3; i < cxt->label->nparts_max; i++)
print_buffer(cxt, ptes[i].sectorbuffer);
+ }
}
static void __attribute__ ((__noreturn__)) handle_quit(struct fdisk_context *cxt)