[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 2/3] qemu-bridge-helper: move repeating code
From: |
Li Qiang |
Subject: |
Re: [Qemu-devel] [PATCH v3 2/3] qemu-bridge-helper: move repeating code in parse_acl_file |
Date: |
Mon, 1 Jul 2019 23:23:39 +0800 |
P J P <address@hidden> 于2019年7月1日周一 下午8:38写道:
> From: Prasad J Pandit <address@hidden>
>
> Move repeating error handling sequence in parse_acl_file routine
> to an 'err' label.
>
> Signed-off-by: Prasad J Pandit <address@hidden>
>
Reviewed-by: Li Qiang <address@hidden>
> ---
> qemu-bridge-helper.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
> index e90c22f07d..91a02f9611 100644
> --- a/qemu-bridge-helper.c
> +++ b/qemu-bridge-helper.c
> @@ -92,9 +92,7 @@ static int parse_acl_file(const char *filename, ACLList
> *acl_list)
>
> if (arg == NULL) {
> fprintf(stderr, "Invalid config line:\n %s\n", line);
> - fclose(f);
> - errno = EINVAL;
> - return -1;
> + goto err;
> }
>
> *arg = 0;
> @@ -111,9 +109,7 @@ static int parse_acl_file(const char *filename,
> ACLList *acl_list)
>
> if (!g_str_equal(cmd, "include") && strlen(arg) >= IFNAMSIZ) {
> fprintf(stderr, "name `%s' too long: %zu\n", arg,
> strlen(arg));
> - fclose(f);
> - errno = EINVAL;
> - return -1;
> + goto err;
> }
>
> if (strcmp(cmd, "deny") == 0) {
> @@ -139,15 +135,18 @@ static int parse_acl_file(const char *filename,
> ACLList *acl_list)
> parse_acl_file(arg, acl_list);
> } else {
> fprintf(stderr, "Unknown command `%s'\n", cmd);
> - fclose(f);
> - errno = EINVAL;
> - return -1;
> + goto err;
> }
> }
>
> fclose(f);
> -
> return 0;
> +
> +err:
> + fclose(f);
> + errno = EINVAL;
> + return -1;
> +
> }
>
> static bool has_vnet_hdr(int fd)
> --
> 2.21.0
>
>