From cd7ee20a68ea4ece11c52dec4b06bf6bd06e0e42 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 14 Apr 2010 09:04:28 +0200 Subject: [PATCH] vshCommandRun: avoid used-uninitialized timing-related report from clang * 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index d5fe6c4b9e..b2a1538b80 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -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