]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
vshCommandRun: avoid used-uninitialized timing-related report from clang
authorJim Meyering <meyering@redhat.com>
Wed, 14 Apr 2010 07:04:28 +0000 (09:04 +0200)
committerJim Meyering <meyering@redhat.com>
Wed, 14 Apr 2010 14:17:56 +0000 (16:17 +0200)
* tools/virsh.c (vshCommandRun): Test only the initial value of
ctl->timing, so that static analyzers don't have to consider that
it might be changed by cmd->def->handler.

tools/virsh.c

index d5fe6c4b9e1691e66dab4cb882c418120e0123ed..b2a1538b80016cb8f5d9355d833c557367bf43c4 100644 (file)
@@ -9411,16 +9411,17 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd)
 
     while (cmd) {
         struct timeval before, after;
+        bool enable_timing = ctl->timing;
 
         if ((ctl->conn == NULL) || (disconnected != 0))
             vshReconnect(ctl);
 
-        if (ctl->timing)
+        if (enable_timing)
             GETTIMEOFDAY(&before);
 
         ret = cmd->def->handler(ctl, cmd);
 
-        if (ctl->timing)
+        if (enable_timing)
             GETTIMEOFDAY(&after);
 
         if (ret == FALSE)
@@ -9440,7 +9441,7 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd)
         if (STREQ(cmd->def->name, "quit"))        /* hack ... */
             return ret;
 
-        if (ctl->timing)
+        if (enable_timing)
             vshPrint(ctl, _("\n(Time: %.3f ms)\n\n"),
                      DIFF_MSEC(&after, &before));
         else