Skip to content
Snippets Groups Projects
Commit 3283dde4 authored by Prasad J Pandit's avatar Prasad J Pandit Committed by Jason Wang
Browse files

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: default avatarPrasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Reviewed-by: default avatarLi Qiang <liq3ea@gmail.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 6f5d8671
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment