diff options
author | Daniel Lange <DLange@git.local> | 2020-12-07 10:26:02 +0100 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2020-12-07 10:26:02 +0100 |
commit | d67ee86091f9e07f8d85c1fb77c7c58989e676bb (patch) | |
tree | 900f5e62bfd8e8c082be75a94f5348dea819beba /BatteryMeter.c | |
parent | 3cbc50cde37fee19ce98ee8260b0a6095b829c4c (diff) | |
parent | 65357c8c46154de4e4eca14075bfe5523bb5fc14 (diff) | |
download | debian_htop-d67ee86091f9e07f8d85c1fb77c7c58989e676bb.tar.gz debian_htop-d67ee86091f9e07f8d85c1fb77c7c58989e676bb.tar.bz2 debian_htop-d67ee86091f9e07f8d85c1fb77c7c58989e676bb.zip |
Update upstream source from tag 'upstream/3.0.3'
Update to upstream version '3.0.3'
with Debian dir 8a3a733dc80e45b1cde220f88fcfd815869742f0
Diffstat (limited to 'BatteryMeter.c')
-rw-r--r-- | BatteryMeter.c | 28 |
1 files changed, 12 insertions, 16 deletions
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 <math.h> + #include "CRT.h" -#include "StringUtils.h" +#include "Object.h" #include "Platform.h" - -#include <string.h> -#include <stdlib.h> +#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 |