From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 6 Apr 2016 08:42:02 +0000 (+0200)
Subject: tools: remove unnecessary defaultConn variable
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0855ef47ddf6f69679cbb655316ba39a21290025;p=libvirt.git

tools: remove unnecessary defaultConn variable

vshStrdup returns NULL without exiting on NULL input.
---

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);