From: Daniel Ferguson <daniel.j.ferguson@intel.com>
Date: Mon, 6 Jun 2016 20:19:40 +0000 (-0700)
Subject: Fix win32 bug in pmutility.c
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9b6153f81c3724fbf1ae17a3ca31fe9cd4c0a06;p=contrib%2Fiotivity.git

Fix win32 bug in pmutility.c

Win32 implementation of pmutility.c:PMTimeout() was broken

Change-Id: I313fac3b7fc2437ad5de89baf03600a01516ed24
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8503
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
---

diff --git a/resource/csdk/security/provisioning/src/pmutility.c b/resource/csdk/security/provisioning/src/pmutility.c
index b52fe47..cdf68b9 100644
--- a/resource/csdk/security/provisioning/src/pmutility.c
+++ b/resource/csdk/security/provisioning/src/pmutility.c
@@ -356,7 +356,6 @@ OCStackResult PMTimeout(unsigned short waittime, bool waitForStackResponse)
 #if defined(HAVE_GETSYSTEMTIMEASFILETIME)
     FILETIME startTime = {0};
     FILETIME currTime = {0};
-    int clock_res = 1;
 
     GetSystemTimeAsFileTime(&startTime);
 #elif defined(HAVE_CLOCK_GETTIME)
@@ -368,16 +367,16 @@ OCStackResult PMTimeout(unsigned short waittime, bool waitForStackResponse)
 # else
     int clock_res = clock_gettime(CLOCK_REALTIME, &startTime);
 # endif // defined(_POSIX_MONOTONIC_CLOCK)
+    if (0 != clock_res)
+    {
+        return OC_STACK_ERROR;
+    }
 
 #else
     ERROR Need PMTimeout implementation
     return OC_STACK_ERROR;
 #endif
 
-    if (0 != clock_res)
-    {
-        return OC_STACK_ERROR;
-    }
     while (OC_STACK_OK == res)
     {
 #if defined(HAVE_GETSYSTEMTIMEASFILETIME)