Changeset 27316 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 12, 2010 9:49:51 AM (15 years ago)

Author:

vboxsync

Message:

Devices/ACPI: fixes for r58659

File:

• trunk/src/VBox/Devices/PC/DrvACPI.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/PC/DrvACPI.cpp

@@ -158 +158 @@
     PDRVACPI pThis = RT_FROM_MEMBER(pInterface, DRVACPI, IACPIConnector);
     RTCritSectEnter(&pThis->CritSect);
-    *pPowerSource = pThis->enmPowerSource, pPowerSource;
+    *pPowerSource = pThis->enmPowerSource;
     RTCritSectLeave(&pThis->CritSect);
 
@@ -274 +274 @@
     *pfPresent = pThis->fBatteryPresent;
     *penmRemainingCapacity = pThis->enmBatteryRemainingCapacity;
-    *penmBatteryState = pThis->enmBatteryState, penmBatteryState;
+    *penmBatteryState = pThis->enmBatteryState;
     *pu32PresentRate = pThis->u32BatteryPresentRate;
     RTCritSectLeave(&pThis->CritSect);
@@ -644 +644 @@
                         if (strstr(szLine, "last full capacity:") != NULL)
                         {
-                            rc = RTStrToInt32Full(szLine + 19, 0, &maxCapacity);
+                            char *psz;
+                            rc = RTStrToInt32Ex(RTStrStripL(&szLine[19]), &psz, 0, &maxCapacity);
                             if (RT_FAILURE(rc))
                                 maxCapacity = INT32_MIN;
@@ -682 +683 @@
                         if (strstr(szLine, "remaining capacity:") != NULL)
                         {
-                            rc = RTStrToInt32Full(szLine + 19, 0, &currentCapacity);
+                            char *psz;
+                            rc = RTStrToInt32Ex(RTStrStripL(&szLine[19]), &psz, 0, &currentCapacity);
                             if (RT_FAILURE(rc))
                                 currentCapacity = INT32_MIN;
@@ -715 +717 @@
                         if (strstr(szLine, "present rate:") != NULL)
                         {
-                            rc = RTStrToInt32Full(szLine + 13, 0, &presentRate);
+                            char *psz;
+                            rc = RTStrToInt32Ex(RTStrStripL(&szLine[13]), &psz, 0, &presentRate);
                             if (RT_FAILURE(rc))
                                 presentRate = 0;
@@ -922 +925 @@
     PDM_DRVREG_VERSION
 };
-