'out' label from cdrom_probe_device() can be removed, and its only instance replaced by 'return prio'.
In raw_co_create(), 'out' can be replaced by 'return -errno' in the error condition it is being called. CC: Kevin Wolf <kw...@redhat.com> CC: qemu-bl...@nongnu.org Signed-off-by: Daniel Henrique Barboza <danielhb...@gmail.com> --- block/file-posix.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 1b805bd938..b1a6549806 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2265,9 +2265,8 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp) /* Create file */ fd = qemu_open(file_opts->filename, O_RDWR | O_CREAT | O_BINARY, 0644); if (fd < 0) { - result = -errno; - error_setg_errno(errp, -result, "Could not create file"); - goto out; + error_setg_errno(errp, errno, "Could not create file"); + return -errno; } /* Take permissions: We want to discard everything, so we need @@ -2342,7 +2341,7 @@ out_close: result = -errno; error_setg_errno(errp, -result, "Could not close the new file"); } -out: + return result; } @@ -3554,7 +3553,7 @@ static int cdrom_probe_device(const char *filename) fd = qemu_open(filename, O_RDONLY | O_NONBLOCK); if (fd < 0) { - goto out; + return prio; } ret = fstat(fd, &st); if (ret == -1 || !S_ISBLK(st.st_mode)) { @@ -3568,7 +3567,6 @@ static int cdrom_probe_device(const char *filename) outc: qemu_close(fd); -out: return prio; } -- 2.24.1