Changeset 85259 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 11, 2020 11:58:17 PM (5 years ago)

Author:

vboxsync

Message:

Main/HostPowerDarwin.cpp: float/double constant mix. bugref:9790

File:

• trunk/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp

@@ -201 +201 @@
                     powerSource = POWER_SOURCE_BATTERY;
 
+
+                /* Fetch the current capacity value of the power source */
                 int curCapacity = 0;
-                int maxCapacity = 1;
-                float remCapacity = 0.0f;
-
-                /* Fetch the current capacity value of the power source */
                 result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSCurrentCapacityKey), &psValue);
                 if (result)
                     CFNumberGetValue((CFNumberRef)psValue, kCFNumberSInt32Type, &curCapacity);
+
                 /* Fetch the maximum capacity value of the power source */
+                int maxCapacity = 1;
                 result = CFDictionaryGetValueIfPresent(pSource, CFSTR(kIOPSMaxCapacityKey), &psValue);
                 if (result)
@@ -215 +215 @@
 
                 /* Calculate the remaining capacity in percent */
-                remCapacity = ((float)curCapacity/(float)maxCapacity * 100.0);
+                float remCapacity = ((float)curCapacity/(float)maxCapacity * 100.0f);
 
                 /* Check for critical. 5 percent is default. */
@@ -222 +222 @@
                 if (result)
                     CFNumberGetValue((CFNumberRef)psValue, kCFNumberSInt32Type, &criticalValue);
-                critical = (remCapacity < criticalValue);
+                critical = remCapacity < criticalValue;
+
                 /* We have to take action only if we are on battery, the
                  * previous state wasn't critical, the state has changed & the