From 65357c8c46154de4e4eca14075bfe5523bb5fc14 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 7 Dec 2020 10:26:01 +0100 Subject: New upstream version 3.0.3 --- BatteryMeter.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'BatteryMeter.c') diff --git a/BatteryMeter.c b/BatteryMeter.c index 859df9d..4836809 100644 --- a/BatteryMeter.c +++ b/BatteryMeter.c @@ -1,7 +1,7 @@ /* htop - BatteryMeter.c (C) 2004-2011 Hisham H. Muhammad -Released under the GNU GPL, see the COPYING file +Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com). @@ -9,29 +9,27 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com). #include "BatteryMeter.h" -#include "Battery.h" -#include "ProcessList.h" +#include + #include "CRT.h" -#include "StringUtils.h" +#include "Object.h" #include "Platform.h" - -#include -#include +#include "XUtils.h" -int BatteryMeter_attributes[] = { +static const int BatteryMeter_attributes[] = { BATTERY }; -static void BatteryMeter_updateValues(Meter * this, char *buffer, int len) { +static void BatteryMeter_updateValues(Meter* this, char* buffer, size_t len) { ACPresence isOnAC; double percent; - Battery_getData(&percent, &isOnAC); + Platform_getBattery(&percent, &isOnAC); - if (percent == -1) { - this->values[0] = 0; - xSnprintf(buffer, len, "n/a"); + if (isnan(percent)) { + this->values[0] = NAN; + xSnprintf(buffer, len, "N/A"); return; } @@ -55,11 +53,9 @@ static void BatteryMeter_updateValues(Meter * this, char *buffer, int len) { } else { xSnprintf(buffer, len, unknownText, percent); } - - return; } -MeterClass BatteryMeter_class = { +const MeterClass BatteryMeter_class = { .super = { .extends = Class(Meter), .delete = Meter_delete -- cgit v1.2.3