styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve battery float-equal warnings 

Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Mike Blumenkrantz 2017-01-06 12:56:22 -05:00
parent 6f1f165d32
commit 49776abae3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/battery/e_mod_udev.c
View File

@ -222,11 +222,11 @@ _battery_udev_battery_update(const char *syspath, Battery *bat)
GET_STR(bat, model, POWER_SUPPLY_MODEL_NAME);
GET_STR(bat, vendor, POWER_SUPPLY_MANUFACTURER);
GET_NUM(bat, design_charge, POWER_SUPPLY_ENERGY_FULL_DESIGN);
if (!bat->design_charge)
if (eina_dbleq(bat->design_charge, 0))
GET_NUM(bat, design_charge, POWER_SUPPLY_CHARGE_FULL_DESIGN);
}
GET_NUM(bat, last_full_charge, POWER_SUPPLY_ENERGY_FULL);
if (!bat->last_full_charge)
if (eina_dbleq(bat->last_full_charge, 0))
GET_NUM(bat, last_full_charge, POWER_SUPPLY_CHARGE_FULL);
test = eeze_udev_syspath_get_property(bat->udi, "POWER_SUPPLY_ENERGY_NOW");
if (!test)
@ -238,14 +238,14 @@ _battery_udev_battery_update(const char *syspath, Battery *bat)
charge = strtod(test, NULL);
eina_stringshare_del(test);
t = ecore_time_get();
if ((bat->got_prop) && (charge != bat->current_charge) && bat->current_charge != 0)
if ((bat->got_prop) && (!eina_dbleq(charge, bat->current_charge)) && (!eina_dbleq(bat->current_charge, 0)))
charge_rate = ((charge - bat->current_charge) / (t - bat->last_update));
if (charge_rate != 0 || bat->last_update == 0 || bat->current_charge == 0)
{
bat->last_update = t;
bat->current_charge = charge;
bat->charge_rate = charge_rate;
}
if ((!eina_dbleq(charge_rate, 0)) || eina_dbleq(bat->last_update, 0) || eina_dbleq(bat->current_charge, 0))
{
bat->last_update = t;
bat->current_charge = charge;
bat->charge_rate = charge_rate;
}
bat->percent = 100 * (bat->current_charge / bat->last_full_charge);
if (bat->got_prop)
{