summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/dos.c
diff options
context:
space:
mode:
authorSami Kerola2013-10-08 00:04:23 +0200
committerKarel Zak2013-10-08 15:47:59 +0200
commit5d324c6b94876e067876b2c924796e543a0f654e (patch)
tree337a16397507954d26be6cfd196ed71168163ccf /libfdisk/src/dos.c
parentdocs: improve grammar and wording of the release-schedule text (diff)
downloadkernel-qcow2-util-linux-5d324c6b94876e067876b2c924796e543a0f654e.tar.gz
kernel-qcow2-util-linux-5d324c6b94876e067876b2c924796e543a0f654e.tar.xz
kernel-qcow2-util-linux-5d324c6b94876e067876b2c924796e543a0f654e.zip
various: fix mixing declarations and code compiler warnings [smatch]
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'libfdisk/src/dos.c')
-rw-r--r--libfdisk/src/dos.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
index 4340d35bd..06971de13 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
@@ -1180,9 +1180,9 @@ static int dos_verify_disklabel(struct fdisk_context *cxt)
}
if (l->ext_offset) {
+ sector_t e_last;
p = self_partition(cxt, l->ext_index);
-
- sector_t e_last = dos_partition_get_start(p)
+ e_last = dos_partition_get_start(p)
+ dos_partition_get_size(p) - 1;
for (i = 4; i < cxt->label->nparts_max; i++) {
@@ -1612,7 +1612,7 @@ static int dos_list_disklabel(struct fdisk_context *cxt)
for (i = 0; i < cxt->label->nparts_max; i++) {
struct pte *pe = self_pte(cxt, i);
struct dos_partition *p = pe->pt_entry;
- unsigned int psects, pblocks, podd = 0;;
+ unsigned int psects, pblocks, podd = 0;
struct fdisk_parttype *type;
struct tt_line *ln;
char *str;