minor issue, add tests for bus callouts

correct minor issue, make code a little more clear, and
add tests for bus callouts.

Change-Id: I47d488cab60098ede3339e4c6a3820348c52acae
RTC: 76254
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5169
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/usr/hwas/common/hwasCallout.C b/src/usr/hwas/common/hwasCallout.C
index fd766bc5a..78153fb00 100644
--- a/src/usr/hwas/common/hwasCallout.C
+++ b/src/usr/hwas/common/hwasCallout.C
@@ -57,11 +57,11 @@ bool retrieveTarget(uint8_t * & io_uData,
     {
         // convert the EntityPath to a Target pointer
         TARGETING::EntityPath ep, *ep_ptr;
-        uint32_t size;
         ep_ptr = (TARGETING::EntityPath *)io_uData;
-        size = TARGETING::EntityPath::MAX_PATH_ELEMENTS - ep_ptr->size();
-        size *= sizeof(TARGETING::EntityPath::PathElement);
-        size = sizeof(ep) - size;
+        // size is total EntityPath size minus unused path elements
+        uint32_t size = sizeof(*ep_ptr) -
+                (TARGETING::EntityPath::MAX_PATH_ELEMENTS - ep_ptr->size()) *
+                    sizeof(TARGETING::EntityPath::PathElement);
         memcpy(&ep, io_uData, size);
         o_pTarget = TARGETING::targetService().toTarget(ep);
         io_uData += size;