diff --git a/src/detection/battery/battery_apple.c b/src/detection/battery/battery_apple.c index 53a2431e5..9f3e3e371 100644 --- a/src/detection/battery/battery_apple.c +++ b/src/detection/battery/battery_apple.c @@ -26,13 +26,13 @@ const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results) continue; } - int intValue; bool boolValue; BatteryResult* battery = ffListAdd(results); ffStrbufInit(&battery->capacity); - if(ffCfDictGetInt(properties, "CurrentCapacity", &intValue)) - ffStrbufAppendF(&battery->capacity, "%d", intValue); + int currentCapacity, maxCapacity; + if(ffCfDictGetInt(properties, "CurrentCapacity", ¤tCapacity) && ffCfDictGetInt(properties, "MaxCapacity", &maxCapacity)) + ffStrbufAppendF(&battery->capacity, "%.0f", currentCapacity * 100.0 / maxCapacity); ffStrbufInit(&battery->manufacturer); ffStrbufInit(&battery->modelName); diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c index db6aee162..909ed493f 100644 --- a/src/detection/battery/battery_linux.c +++ b/src/detection/battery/battery_linux.c @@ -78,10 +78,7 @@ const char* ffDetectBatteryImpl(FFinstance* instance, FFlist* results) { if(instance->config.batteryDir.length > 0) { ffStrbufAppend(&baseDir, &instance->config.batteryDir); - if (!ffStrbufEndsWithC(&baseDir, '/')) - { - ffStrbufAppendC(&baseDir, '/'); - } + ffStrbufEnsureEndsWithC(&baseDir, '/'); } else {