[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 57/59] linux-user/syscall.c: fix trailing whitespaces and style, (continued)
- [PATCH v1 57/59] linux-user/syscall.c: fix trailing whitespaces and style, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 58/59] linux-user/syscall.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 59/59] linux-user/vm86.c: remove unneeded label in do_vm86(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 05/59] ram.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 14/59] block/file-posix.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 29/59] cryptodev-vhost.c: remove unneeded 'err' label in cryptodev_vhost_start, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 34/59] ipmi/ipmi_bt.c: remove unneeded label in ipmi_bt_handle_event, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 35/59] ipmi_bmc_extern.c: remove unneeded label in ipmi_bmc_extern_handle_command, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 37/59] s390x/event-facility.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 40/59] hsb/hcd-ehci.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06