zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop always true condition

This commit is contained in:
Christian Göttsche 2020-10-27 11:50:18 +01:00 committed by cgzones
parent ac2b07eddd
commit 059810ca65
1 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
darwin/Battery.c
View File

@ -17,59 +17,57 @@ void Battery_getData(double* level, ACPresence* isOnAC) {
return; return;
} }
if(power_sources != NULL) { CFArrayRef list = IOPSCopyPowerSourcesList(power_sources);
CFArrayRef list = IOPSCopyPowerSourcesList(power_sources); CFDictionaryRef battery = NULL;
CFDictionaryRef battery = NULL; int len;
int len;
if(NULL == list) { if(NULL == list) {
CFRelease(power_sources); CFRelease(power_sources);
return; return;
} }
len = CFArrayGetCount(list); len = CFArrayGetCount(list);
/* Get the battery */ /* Get the battery */
for(int i = 0; i < len && battery == NULL; ++i) { for(int i = 0; i < len && battery == NULL; ++i) {
CFDictionaryRef candidate = IOPSGetPowerSourceDescription(power_sources, CFDictionaryRef candidate = IOPSGetPowerSourceDescription(power_sources,
CFArrayGetValueAtIndex(list, i)); /* GET rule */ CFArrayGetValueAtIndex(list, i)); /* GET rule */
CFStringRef type; CFStringRef type;
if(NULL != candidate) { if(NULL != candidate) {
type = (CFStringRef) CFDictionaryGetValue(candidate, type = (CFStringRef) CFDictionaryGetValue(candidate,
CFSTR(kIOPSTransportTypeKey)); /* GET rule */ CFSTR(kIOPSTransportTypeKey)); /* GET rule */
if(kCFCompareEqualTo == CFStringCompare(type, CFSTR(kIOPSInternalType), 0)) { if(kCFCompareEqualTo == CFStringCompare(type, CFSTR(kIOPSInternalType), 0)) {
CFRetain(candidate); CFRetain(candidate);
battery = 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;
/* Get the percentage remaining */
double current;
double max;
CFNumberGetValue(CFDictionaryGetValue(battery, CFSTR(kIOPSCurrentCapacityKey)),
kCFNumberDoubleType, &current);
CFNumberGetValue(CFDictionaryGetValue(battery, CFSTR(kIOPSMaxCapacityKey)),
kCFNumberDoubleType, &max);
*level = (current * 100.0) / max;
CFRelease(battery);
}
CFRelease(list);
CFRelease(power_sources);
} }
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;
/* Get the percentage remaining */
double current;
double max;
CFNumberGetValue(CFDictionaryGetValue(battery, CFSTR(kIOPSCurrentCapacityKey)),
kCFNumberDoubleType, &current);
CFNumberGetValue(CFDictionaryGetValue(battery, CFSTR(kIOPSMaxCapacityKey)),
kCFNumberDoubleType, &max);
*level = (current * 100.0) / max;
CFRelease(battery);
}
CFRelease(list);
CFRelease(power_sources);
} }