From 49776abae39d919212149dda35ca593c3bea9d3c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 6 Jan 2017 12:56:22 -0500 Subject: [PATCH] resolve battery float-equal warnings Reviewed-by: Derek Foreman --- src/modules/battery/e_mod_udev.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/battery/e_mod_udev.c b/src/modules/battery/e_mod_udev.c index ef305f8f1..9d7b6e9fd 100644 --- a/src/modules/battery/e_mod_udev.c +++ b/src/modules/battery/e_mod_udev.c @@ -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) {