ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fdisk: don't use ptes[] in generic code 

... the array is MBR specific.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2013-06-12 17:32:03 +02:00
parent 97b820bffd
commit 76b86412c6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdisks/fdisk.c
View File

@ -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)

2
fdisks/fdiskdoslabel.c
View File

@ -190,6 +190,7 @@ static int dos_delete_partition(struct fdisk_context *cxt, size_t partnum)
ptes[ext_index].ext_pointer = NULL;
extended_offset = 0;
}
ptes[partnum].changed = 1;
clear_partition(p);
} else if (!q->sys_ind && partnum > 4) {
/* the last one in the chain - just delete */
@ -1100,6 +1101,7 @@ static int dos_set_parttype(
"partitions, please see the fdisk manual page for additional "
"information.\n\n"));
ptes[partnum].changed = 1;
p->sys_ind = t->type;
fdisk_label_set_changed(cxt->label, 1);
return 0;