Changeset 26114 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 1, 2010 11:13:06 AM (15 years ago)

Author:

vboxsync

Message:

VBoxService/timesync: Return status on hard sync.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp

@@ -435 +435 @@
  * @param   pDrift              The time adjustment.
  */
-static void VBoxServiceTimeSyncSet(PCRTTIMESPEC pDrift)
+static bool VBoxServiceTimeSyncSet(PCRTTIMESPEC pDrift)
 {
     /*
      * Query the current time, add the adjustment, then try it.
      */
+    int rc;
 #ifdef RT_OS_WINDOWS
     RTTIMESPEC hostNow;
-    int rc = VbglR3GetHostTime(&hostNow);
+    rc = VbglR3GetHostTime(&hostNow);
     if (RT_FAILURE(rc))
     {
@@ -456 +457 @@
         {
             if (!SetSystemTime(&st))
-                VBoxServiceError("SetSystemTime failed, error=%u\n", GetLastError());
+            {
+                rc = RTErrConvertFromWin32(GetLastError());
+                VBoxServiceError("SetSystemTime failed, error=%Rrc\n", rc);
+            }
+            else rc = VINF_SUCCESS;
         }
         else
-            VBoxServiceError("Cannot convert system times, error=%u\n", GetLastError());
+        {
+            rc = RTErrConvertFromWin32(GetLastError());
+            VBoxServiceError("Cannot convert system times, error=%Rrc\n", rc);
+        }
     }
 #else  /* !RT_OS_WINDOWS */
@@ -481 +489 @@
 # endif
             g_cTimeSyncErrors = 0;
-        }
-        else if (g_cTimeSyncErrors++ < 10)
-            VBoxServiceError("settimeofday failed; errno=%d: %s\n", errno, strerror(errno));
-    }
-    else if (g_cTimeSyncErrors++ < 10)
-        VBoxServiceError("gettimeofday failed; errno=%d: %s\n", errno, strerror(errno));
+            rc = VINF_SUCCESS;
+        }
+        else 
+        {
+            rc = RTErrConvertFromErrno(errno);
+            if (g_cTimeSyncErrors++ < 10)
+                VBoxServiceError("settimeofday failed; errno=%d: %s\n", errno, strerror(errno));
+        }
+    }
+    else 
+    {
+        rc = RTErrConvertFromErrno(errno);
+        if (g_cTimeSyncErrors++ < 10)
+            VBoxServiceError("gettimeofday failed; errno=%d: %s\n", errno, strerror(errno));
+    }
 #endif /* !RT_OS_WINDOWS */
+    return RT_SUCCESS(rc) ? true : false;
 }