From: Martin Kletzander <mkletzan@redhat.com>
Date: Thu, 9 Oct 2014 08:00:05 +0000 (+0200)
Subject: Fix leftover typo '&' -> '&&'
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4d2a8a0a0c7876f4c1445573cbe28aa1049cfce7;p=libvirt.git

Fix leftover typo '&' -> '&&'

The actual origin of this so called typo are two commits.  The first one
was commit 72f8a7f that came up with the following condition:

if ((i == 8) & (flags & VIR_QEMU_PROCESS_KILL_FORCE))

Fortunately this succeeded thanks to bool being (int)1 and
VIR_QEMU_PROCESS_KILL_FORCE having the value of 1 << 0.  The check was
then moved and altered in 8fd38231179c394f07d8a26bcbf3a0faa5eeaf24 to
current state:

if ((i == 50) & force)

that will work again (both sides of '&' being booleans), but since this
was missed so many times, it may pose a problem in the future in case it
gets copy-pasted again.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 486123a292..fe497b955e 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -354,7 +354,7 @@ virProcessKillPainfully(pid_t pid, bool force)
         int signum;
         if (i == 0) {
             signum = SIGTERM; /* kindly suggest it should exit */
-        } else if ((i == 50) & force) {
+        } else if (i == 50 && force) {
             VIR_DEBUG("Timed out waiting after SIGTERM to process %lld, "
                       "sending SIGKILL", (long long)pid);
             /* No SIGKILL kill on Win32 ! Use SIGABRT instead which our