From 0855ef47ddf6f69679cbb655316ba39a21290025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 6 Apr 2016 10:42:02 +0200 Subject: [PATCH] tools: remove unnecessary defaultConn variable vshStrdup returns NULL without exiting on NULL input. --- tools/virsh.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8c616d6373..fe338397ce 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -908,7 +908,6 @@ main(int argc, char **argv) { vshControl _ctl, *ctl = &_ctl; virshControl virshCtl; - const char *defaultConn; bool ret = true; memset(ctl, 0, sizeof(vshControl)); @@ -977,8 +976,7 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } - if ((defaultConn = virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI"))) - ctl->connname = vshStrdup(ctl, defaultConn); + ctl->connname = vshStrdup(ctl, virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI")); if (!ctl->imode) { ret = vshCommandRun(ctl, ctl->cmd);