From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yo8RG-0000dv-6e for qemu-devel@nongnu.org; Fri, 01 May 2015 06:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yo8RB-0006nI-7T for qemu-devel@nongnu.org; Fri, 01 May 2015 06:44:58 -0400 From: "Daniel P. Berrange" Date: Fri, 1 May 2015 11:44:46 +0100 Message-Id: <1430477086-26830-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH] ui: remove check for failure of qemu_acl_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Gerd Hoffmann 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 --- ui/vnc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index cffb5b7..6bfe228 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3602,10 +3602,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 @@ -3619,10 +3615,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 -- 2.1.0