From df132cab81fa6075e82a2670bbf20e4001e3d336 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 10 Sep 2012 07:55:15 +0000 Subject: [PATCH] patches from Basil Gor (basil.gor@gmail.com) fixing stringshare usage in battery module. thanks! SVN revision: 76369 --- src/modules/battery/e_mod_udev.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modules/battery/e_mod_udev.c b/src/modules/battery/e_mod_udev.c index 58b1b40e8..421e511c4 100644 --- a/src/modules/battery/e_mod_udev.c +++ b/src/modules/battery/e_mod_udev.c @@ -184,13 +184,16 @@ _battery_udev_battery_update_poll(void *data) return EINA_TRUE; } -#define GET_NUM(TYPE, VALUE, PROP) test = eeze_udev_syspath_get_property(TYPE->udi, #PROP); \ +#define GET_NUM(TYPE, VALUE, PROP) \ do \ - if (test) \ - { \ - TYPE->VALUE = strtod(test, NULL); \ - eina_stringshare_del(test); \ - } \ + { \ + test = eeze_udev_syspath_get_property(TYPE->udi, #PROP); \ + if (test) \ + { \ + TYPE->VALUE = strtod(test, NULL); \ + eina_stringshare_del(test); \ + } \ + } \ while (0) #define GET_STR(TYPE, VALUE, PROP) TYPE->VALUE = eeze_udev_syspath_get_property(TYPE->udi, #PROP) @@ -224,10 +227,7 @@ _battery_udev_battery_update(const char *syspath, Battery *bat) GET_NUM(bat, last_full_charge, POWER_SUPPLY_CHARGE_FULL); test = eeze_udev_syspath_get_property(bat->udi, "POWER_SUPPLY_ENERGY_NOW"); if (!test) - { - eina_stringshare_del(test); - test = eeze_udev_syspath_get_property(bat->udi, "POWER_SUPPLY_CHARGE_NOW"); - } + test = eeze_udev_syspath_get_property(bat->udi, "POWER_SUPPLY_CHARGE_NOW"); if (test) {