[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 14/59] block/file-posix.c: remove unneeded labels
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v1 14/59] block/file-posix.c: remove unneeded labels |
Date: |
Mon, 6 Jan 2020 15:23:40 -0300 |
'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 <address@hidden>
CC: address@hidden
Signed-off-by: Daniel Henrique Barboza <address@hidden>
---
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
- Re: [PATCH v1 10/59] chardev/char-win.c: remove 'fail' label in win_chr_serial_init(), (continued)
[PATCH v1 13/59] block/vdi.c: remove 'fail' label in vdi_open(), Daniel Henrique Barboza, 2020/01/06
[PATCH v1 14/59] block/file-posix.c: remove unneeded labels,
Daniel Henrique Barboza <=
[PATCH v1 15/59] block/blkreplay.c: remove unneeded 'fail' label in blkreplay_open(), Daniel Henrique Barboza, 2020/01/06
[PATCH v1 16/59] block/gluster.c: remove unneeded 'exit' label, 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, 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