[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 17/59] block/dmg.c: remove unneeded 'fail' label in dmg_read_m
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v1 17/59] block/dmg.c: remove unneeded 'fail' label in dmg_read_mish_block() |
Date: |
Mon, 6 Jan 2020 15:23:43 -0300 |
Both the 'fail' label and 'ret' variable can be removed from the
function. Instead, call 'return -EINVAL' in the error conditions.
CC: Stefan Hajnoczi <address@hidden>
CC: address@hidden
Signed-off-by: Daniel Henrique Barboza <address@hidden>
---
block/dmg.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/block/dmg.c b/block/dmg.c
index 4a045f2b3e..ce39a87864 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -217,7 +217,6 @@ static int dmg_read_mish_block(BDRVDMGState *s,
DmgHeaderState *ds,
uint8_t *buffer, uint32_t count)
{
uint32_t type, i;
- int ret;
size_t new_size;
uint32_t chunk_count;
int64_t offset = 0;
@@ -273,8 +272,7 @@ static int dmg_read_mish_block(BDRVDMGState *s,
DmgHeaderState *ds,
error_report("sector count %" PRIu64 " for chunk %" PRIu32
" is larger than max (%u)",
s->sectorcounts[i], i, DMG_SECTORCOUNTS_MAX);
- ret = -EINVAL;
- goto fail;
+ return -EINVAL;
}
/* offset in (compressed) data fork */
@@ -288,8 +286,7 @@ static int dmg_read_mish_block(BDRVDMGState *s,
DmgHeaderState *ds,
error_report("length %" PRIu64 " for chunk %" PRIu32
" is larger than max (%u)",
s->lengths[i], i, DMG_LENGTHS_MAX);
- ret = -EINVAL;
- goto fail;
+ return -EINVAL;
}
update_max_chunk_size(s, i, &ds->max_compressed_size,
@@ -298,9 +295,6 @@ static int dmg_read_mish_block(BDRVDMGState *s,
DmgHeaderState *ds,
}
s->n_chunks += chunk_count;
return 0;
-
-fail:
- return ret;
}
static int dmg_read_resource_fork(BlockDriverState *bs, DmgHeaderState *ds,
--
2.24.1
- Re: [PATCH v1 00/59] trivial unneeded labels cleanup, (continued)
Re: [PATCH v1 00/59] trivial unneeded labels cleanup, Markus Armbruster, 2020/01/13
[PATCH v1 06/59] mips-semi.c: remove 'uhi_done' label in helper_do_semihosting(), Daniel Henrique Barboza, 2020/01/06
[PATCH v1 17/59] block/dmg.c: remove unneeded 'fail' label in dmg_read_mish_block(),
Daniel Henrique Barboza <=
[PATCH v1 19/59] block/ssh.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
[PATCH v1 03/59] kvm-all.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
[PATCH v1 01/59] spapr.c: remove 'out' label in spapr_dt_cas_updates(), Daniel Henrique Barboza, 2020/01/06
[PATCH v1 02/59] ppc440_bamboo.c: remove label from bamboo_load_device_tree(), Daniel Henrique Barboza, 2020/01/06
[PATCH v1 04/59] paaudio.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
[PATCH v1 07/59] unicore32/softmmu.c: remove 'do_fault' label in get_phys_addr_ucv2(), Daniel Henrique Barboza, 2020/01/06