Fix unused-const-variable compiler warning

The variable MSECS_PER_SEC was declared but not used.
There were two ways to solve this compiler warning.
  1. Delete variable
  2. Use variable

Option 2 was used for this change. In several locations that the
hardcoded number 1000 was used that was clearly intended to be
MSECS_PER_SEC. This also results in a few locations where
multiplication by MSECS_PER_SEC is used to conver the time to
micro seconds.

While doing this one location was updated to also use the USECS_PER_SEC
const variable.

Change-Id: I448fc1ca614b0d8be7ea4836da6406dbd69ef325
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16801
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>

diff --git a/resource/csdk/connectivity/src/caretransmission.c b/resource/csdk/connectivity/src/caretransmission.c
index 57fa724..f9cb544 100644 (file)
--- a/resource/csdk/connectivity/src/caretransmission.c
+++ b/resource/csdk/connectivity/src/caretransmission.c
@@ -111,8 +111,8 @@ static uint64_t CAGetTimeoutValue()
         OIC_LOG(ERROR, TAG, "OCGetRandomBytes failed");
     }
 
-    return ((DEFAULT_ACK_TIMEOUT_SEC * 1000) + ((1000 * randomValue) >> 8)) *
-            (uint64_t) 1000;
+    return ((DEFAULT_ACK_TIMEOUT_SEC * MSECS_PER_SEC) + ((MSECS_PER_SEC * (uint64_t)randomValue) >> 8)) *
+             MSECS_PER_SEC;
 }
 
 CAResult_t CARetransmissionStart(CARetransmission_t *context)
@@ -153,7 +153,7 @@ static bool CACheckTimeout(uint64_t currentTime, CARetransmissionData_t *retData
 #ifndef SINGLE_THREAD
     // #1. calculate timeout
     uint32_t milliTimeoutValue = retData->timeout * 0.001;
-    uint64_t timeout = (milliTimeoutValue << retData->triedCount) * (uint64_t) 1000;
+    uint64_t timeout = ((uint64_t) milliTimeoutValue << retData->triedCount) * MSECS_PER_SEC;
 
     if (currentTime >= retData->timeStamp + timeout)
     {
@@ -163,7 +163,7 @@ static bool CACheckTimeout(uint64_t currentTime, CARetransmissionData_t *retData
     }
 #else
     // #1. calculate timeout
-    uint64_t timeOut = (2 << retData->triedCount) * (uint64_t) 1000000;
+    uint64_t timeOut = (2 << retData->triedCount) * (uint64_t) USECS_PER_SEC;
 
     if (currentTime >= retData->timeStamp + timeOut)
     {