keepalive: Resolve Coverity complaint

The Coverity analysis emitted a BAD_SIZEOF error when doing the math
within the TRACE macro. Doing the math outside the macro keeps Coverity quiet.

diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index f57fed4f5560560da16a585c8f58fff054451f60..d1fa642fd2bc902fefd805d533a8a2b2a20e936d 100644 (file)
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -1,7 +1,7 @@
 /*
  * virkeepalive.c: keepalive handling
  *
- * Copyright (C) 2011 Red Hat, Inc.
+ * Copyright (C) 2011-2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -117,28 +117,28 @@ virKeepAliveTimerInternal(virKeepAlivePtr ka,
                           virNetMessagePtr *msg)
 {
     time_t now = time(NULL);
+    int timeval;
 
     if (ka->interval <= 0 || ka->intervalStart == 0)
         return false;
 
     if (now - ka->intervalStart < ka->interval) {
-        int timeout = ka->interval - (now - ka->intervalStart);
-        virEventUpdateTimeout(ka->timer, timeout * 1000);
+        timeval = ka->interval - (now - ka->intervalStart);
+        virEventUpdateTimeout(ka->timer, timeval * 1000);
         return false;
     }
 
+    timeval = now - ka->lastPacketReceived;
     PROBE(RPC_KEEPALIVE_TIMEOUT,
           "ka=%p client=%p countToDeath=%d idle=%d",
-          ka, ka->client, ka->countToDeath,
-          (int) (now - ka->lastPacketReceived));
-
+          ka, ka->client, ka->countToDeath, timeval);
 
     if (ka->countToDeath == 0) {
         VIR_WARN("No response from client %p after %d keepalive messages in"
                  " %d seconds",
                  ka->client,
                  ka->count,
-                 (int) (now - ka->lastPacketReceived));
+                 timeval);
         return true;
     } else {
         ka->countToDeath--;