[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 25/59] block/vhdx.c: remove unneeded 'exit' labels
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v1 25/59] block/vhdx.c: remove unneeded 'exit' labels |
Date: |
Mon, 6 Jan 2020 15:23:51 -0300 |
'exit' label of vhdx_region_check() and vhdx_update_header()
can be replaced by 'return' statements.
CC: Jeff Cody <address@hidden>
CC: address@hidden
Signed-off-by: Daniel Henrique Barboza <address@hidden>
---
block/vhdx.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/block/vhdx.c b/block/vhdx.c
index f02d2611be..7a1ea312ed 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -229,7 +229,6 @@ void vhdx_guid_generate(MSGUID *guid)
/* Check for region overlaps inside the VHDX image */
static int vhdx_region_check(BDRVVHDXState *s, uint64_t start, uint64_t length)
{
- int ret = 0;
uint64_t end;
VHDXRegionEntry *r;
@@ -239,13 +238,11 @@ static int vhdx_region_check(BDRVVHDXState *s, uint64_t
start, uint64_t length)
error_report("VHDX region %" PRIu64 "-%" PRIu64 " overlaps with "
"region %" PRIu64 "-%." PRIu64, start, end, r->start,
r->end);
- ret = -EINVAL;
- goto exit;
+ return -EINVAL;
}
}
-exit:
- return ret;
+ return 0;
}
/* Register a region for future checks */
@@ -390,11 +387,10 @@ static int vhdx_update_header(BlockDriverState *bs,
BDRVVHDXState *s,
ret = vhdx_write_header(bs->file, inactive_header, header_offset, true);
if (ret < 0) {
- goto exit;
+ return ret;
}
s->curr_header = hdr_idx;
-exit:
return ret;
}
--
2.24.1
- [PATCH v1 17/59] block/dmg.c: remove unneeded 'fail' label in dmg_read_mish_block(), (continued)
- [PATCH v1 17/59] block/dmg.c: remove unneeded 'fail' label in dmg_read_mish_block(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 19/59] block/ssh.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 20/59] block/vpc.c: remove unneeded 'fail' label in create_dynamic_disk(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 18/59] qcow2-refcount.c: remove unneeded 'fail' label in qcow2_refcount_init(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 21/59] block/backup.c remove unneeded 'out' label in backup_run(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 22/59] block/vmdk.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 23/59] block/vxhs.c: remove unneeded 'out' label in vxhs_iio_callback(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 24/59] block/vhdx-log.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 25/59] block/vhdx.c: remove unneeded 'exit' labels,
Daniel Henrique Barboza <=
- [PATCH v1 26/59] block/replication.c: remove unneeded label in replication_co_writev, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 27/59] crypto/block-luks.c: remove unneeded label in qcrypto_block_luks_find_key, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 28/59] qga/commands-win32.c: remove 'out' label in get_pci_info, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 29/59] cryptodev-vhost.c: remove unneeded 'err' label in cryptodev_vhost_start, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 30/59] util/module.c: remove unneeded label in module_load_file(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 31/59] util/aio-posix.c: remove unneeded 'out' label in aio_epoll, Daniel Henrique Barboza, 2020/01/06