summaryrefslogtreecommitdiffstats
path: root/darwin
diff options
context:
space:
mode:
authorChristian Göttsche <cgzones@googlemail.com>2020-10-27 11:50:18 +0100
committercgzones <cgzones@googlemail.com>2020-10-27 18:00:43 +0100
commit059810ca65385d3feb3fc67857437bd740641c53 (patch)
tree0dc87fc84db56000f6e6eeb987ea60836b985623 /darwin
parentac2b07eddd6f0b7c41b84b71653ca90fd301085f (diff)
Drop always true condition
Diffstat (limited to 'darwin')
-rw-r--r--darwin/Battery.c78
1 files changed, 38 insertions, 40 deletions
diff --git a/darwin/Battery.c b/darwin/Battery.c
index 772f3886..d82d0ffd 100644
--- a/darwin/Battery.c
+++ b/darwin/Battery.c
@@ -17,59 +17,57 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
return;
}
- if(power_sources != NULL) {
- CFArrayRef list = IOPSCopyPowerSourcesList(power_sources);
- CFDictionaryRef battery = NULL;
- int len;
+ CFArrayRef list = IOPSCopyPowerSourcesList(power_sources);
+ CFDictionaryRef battery = NULL;
+ int len;
- if(NULL == list) {
- CFRelease(power_sources);
+ if(NULL == list) {
+ CFRelease(power_sources);
- return;
- }
+ return;
+ }
- len = CFArrayGetCount(list);
+ len = CFArrayGetCount(list);
- /* Get the battery */
- for(int i = 0; i < len && battery == NULL; ++i) {
- CFDictionaryRef candidate = IOPSGetPowerSourceDescription(power_sources,
- CFArrayGetValueAtIndex(list, i)); /* GET rule */
- CFStringRef type;
+ /* Get the battery */
+ for(int i = 0; i < len && battery == NULL; ++i) {
+ CFDictionaryRef candidate = IOPSGetPowerSourceDescription(power_sources,
+ CFArrayGetValueAtIndex(list, i)); /* GET rule */
+ CFStringRef type;
- if(NULL != candidate) {
- type = (CFStringRef) CFDictionaryGetValue(candidate,
- CFSTR(kIOPSTransportTypeKey)); /* GET rule */
+ if(NULL != candidate) {
+ type = (CFStringRef) CFDictionaryGetValue(candidate,
+ CFSTR(kIOPSTransportTypeKey)); /* GET rule */
- if(kCFCompareEqualTo == CFStringCompare(type, CFSTR(kIOPSInternalType), 0)) {
- CFRetain(candidate);
- battery = candidate;
- }
+ if(kCFCompareEqualTo == CFStringCompare(type, CFSTR(kIOPSInternalType), 0)) {
+ CFRetain(candidate);
+ battery = candidate;
}
}
+ }
- if(NULL != battery) {
- /* Determine the AC state */
- CFStringRef power_state = CFDictionaryGetValue(battery, CFSTR(kIOPSPowerSourceStateKey));
-
- *isOnAC = (kCFCompareEqualTo == CFStringCompare(power_state, CFSTR(kIOPSACPowerValue), 0))
- ? AC_PRESENT
- : AC_ABSENT;
+ if(NULL != battery) {
+ /* Determine the AC state */
+ CFStringRef power_state = CFDictionaryGetValue(battery, CFSTR(kIOPSPowerSourceStateKey));
- /* Get the percentage remaining */
- double current;
- double max;
+ *isOnAC = (kCFCompareEqualTo == CFStringCompare(power_state, CFSTR(kIOPSACPowerValue), 0))
+ ? AC_PRESENT
+ : AC_ABSENT;
- CFNumberGetValue(CFDictionaryGetValue(battery, CFSTR(kIOPSCurrentCapacityKey)),
- kCFNumberDoubleType, &current);
- CFNumberGetValue(CFDictionaryGetValue(battery, CFSTR(kIOPSMaxCapacityKey)),
- kCFNumberDoubleType, &max);
+ /* Get the percentage remaining */
+ double current;
+ double max;
- *level = (current * 100.0) / max;
+ CFNumberGetValue(CFDictionaryGetValue(battery, CFSTR(kIOPSCurrentCapacityKey)),
+ kCFNumberDoubleType, &current);
+ CFNumberGetValue(CFDictionaryGetValue(battery, CFSTR(kIOPSMaxCapacityKey)),
+ kCFNumberDoubleType, &max);
- CFRelease(battery);
- }
+ *level = (current * 100.0) / max;
- CFRelease(list);
- CFRelease(power_sources);
+ CFRelease(battery);
}
+
+ CFRelease(list);
+ CFRelease(power_sources);
}

© 2014-2024 Faster IT GmbH | imprint | privacy policy