[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/5] ui: remove check for failure of qemu_acl_init()
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/5] ui: remove check for failure of qemu_acl_init() |
Date: |
Wed, 20 May 2015 10:34:10 +0200 |
From: "Daniel P. Berrange" <address@hidden>
The qemu_acl_init() function has long since stopped being able
to return NULL, since g_malloc will abort on OOM. As such the
checks for NULL were unreachable code.
Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 2dccae9..076355d 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3609,10 +3609,6 @@ void vnc_display_open(const char *id, Error **errp)
aclname = g_strdup_printf("vnc.%s.x509dname", vs->id);
}
vs->tls.acl = qemu_acl_init(aclname);
- if (!vs->tls.acl) {
- fprintf(stderr, "Failed to create x509 dname ACL\n");
- exit(1);
- }
g_free(aclname);
}
#endif
@@ -3626,10 +3622,6 @@ void vnc_display_open(const char *id, Error **errp)
aclname = g_strdup_printf("vnc.%s.username", vs->id);
}
vs->sasl.acl = qemu_acl_init(aclname);
- if (!vs->sasl.acl) {
- fprintf(stderr, "Failed to create username ACL\n");
- exit(1);
- }
g_free(aclname);
}
#endif
--
1.8.3.1
- [Qemu-devel] [PULL 0/5] vnc patch queue, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 4/5] vnc: Tweak error when init fails, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 3/5] vnc: Don't assert if opening unix socket fails, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 2/5] ui: remove check for failure of qemu_acl_init(),
Gerd Hoffmann <=
- [Qemu-devel] [PULL 5/5] qemu-sockets: Report explicit error if unlink fails, Gerd Hoffmann, 2015/05/20
- [Qemu-devel] [PULL 1/5] Strip brackets from vnc host, Gerd Hoffmann, 2015/05/20
- Re: [Qemu-devel] [PULL 0/5] vnc patch queue, Peter Maydell, 2015/05/21