diff options
author | Prasad J Pandit <pjp@fedoraproject.org> | 2019-07-23 16:17:53 +0530 |
---|---|---|
committer | Jason Wang <jasowang@redhat.com> | 2019-07-29 16:29:30 +0800 |
commit | 3283dde4b5b5cce0f96f48d536bebff66d97ce0b (patch) | |
tree | d6ccbfa35ee5879202f385e579a5722dce184e07 /qemu-bridge-helper.c | |
parent | 6f5d8671225dc77190647f18a27a0d156d4ca97a (diff) | |
download | qemu-3283dde4b5b5cce0f96f48d536bebff66d97ce0b.zip qemu-3283dde4b5b5cce0f96f48d536bebff66d97ce0b.tar.gz qemu-3283dde4b5b5cce0f96f48d536bebff66d97ce0b.tar.bz2 |
qemu-bridge-helper: move repeating code in parse_acl_file
Move repeating error handling sequence in parse_acl_file routine
to an 'err' label.
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'qemu-bridge-helper.c')
-rw-r--r-- | qemu-bridge-helper.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index 2058e10..3d50ec0 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -102,9 +102,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; @@ -121,9 +119,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) { @@ -149,15 +145,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) |