[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v1 09/59] chardev/char-pipe.c: remove 'fail' label in win_chr
From: |
Marc-André Lureau |
Subject: |
Re: [PATCH v1 09/59] chardev/char-pipe.c: remove 'fail' label in win_chr_pipe_init() |
Date: |
Mon, 6 Jan 2020 23:01:31 +0400 |
On Mon, Jan 6, 2020 at 10:25 PM Daniel Henrique Barboza
<address@hidden> wrote:
>
> The 'fail' label is simply doing a 'return -1'.
>
> CC: Marc-André Lureau <address@hidden>
> CC: Paolo Bonzini <address@hidden>
> Signed-off-by: Daniel Henrique Barboza <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
> ---
> chardev/char-pipe.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
> index 94d714ffcd..65d52beb0d 100644
> --- a/chardev/char-pipe.c
> +++ b/chardev/char-pipe.c
> @@ -54,12 +54,12 @@ static int win_chr_pipe_init(Chardev *chr, const char
> *filename,
> s->hsend = CreateEvent(NULL, TRUE, FALSE, NULL);
> if (!s->hsend) {
> error_setg(errp, "Failed CreateEvent");
> - goto fail;
> + return -1;
> }
> s->hrecv = CreateEvent(NULL, TRUE, FALSE, NULL);
> if (!s->hrecv) {
> error_setg(errp, "Failed CreateEvent");
> - goto fail;
> + return -1;
> }
>
> openname = g_strdup_printf("\\\\.\\pipe\\%s", filename);
> @@ -72,7 +72,7 @@ static int win_chr_pipe_init(Chardev *chr, const char
> *filename,
> if (s->file == INVALID_HANDLE_VALUE) {
> error_setg(errp, "Failed CreateNamedPipe (%lu)", GetLastError());
> s->file = NULL;
> - goto fail;
> + return -1;
> }
>
> ZeroMemory(&ov, sizeof(ov));
> @@ -80,7 +80,7 @@ static int win_chr_pipe_init(Chardev *chr, const char
> *filename,
> ret = ConnectNamedPipe(s->file, &ov);
> if (ret) {
> error_setg(errp, "Failed ConnectNamedPipe");
> - goto fail;
> + return -1;
> }
>
> ret = GetOverlappedResult(s->file, &ov, &size, TRUE);
> @@ -90,7 +90,7 @@ static int win_chr_pipe_init(Chardev *chr, const char
> *filename,
> CloseHandle(ov.hEvent);
> ov.hEvent = NULL;
> }
> - goto fail;
> + return -1;
> }
>
> if (ov.hEvent) {
> @@ -99,9 +99,6 @@ static int win_chr_pipe_init(Chardev *chr, const char
> *filename,
> }
> qemu_add_polling_cb(win_chr_pipe_poll, chr);
> return 0;
> -
> - fail:
> - return -1;
> }
>
> static void qemu_chr_open_pipe(Chardev *chr,
> --
> 2.24.1
>
- Re: [PATCH v1 05/59] ram.c: remove unneeded labels, (continued)
- [PATCH v1 07/59] unicore32/softmmu.c: remove 'do_fault' label in get_phys_addr_ucv2(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 06/59] mips-semi.c: remove 'uhi_done' label in helper_do_semihosting(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 08/59] chardev/char-mux.c: remove 'send_char' label, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 09/59] chardev/char-pipe.c: remove 'fail' label in win_chr_pipe_init(), Daniel Henrique Barboza, 2020/01/06
- Re: [PATCH v1 09/59] chardev/char-pipe.c: remove 'fail' label in win_chr_pipe_init(),
Marc-André Lureau <=
- [PATCH v1 10/59] chardev/char-win.c: remove 'fail' label in win_chr_serial_init(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 11/59] exec.c: remove 'err' label in ram_block_discard_range(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 12/59] virtfs-proxy-helper.c: remove 'err_out' label in setugid(), Daniel Henrique Barboza, 2020/01/06