From 31700b64db7308207a6cee60a9a2f3dd4a70fea1 Mon Sep 17 00:00:00 2001 From: Michal Skorupinski Date: Fri, 21 Aug 2015 17:49:45 +0200 Subject: [PATCH] [FIX] Code fixes according to clockwork and c++test Change-Id: I06126a898d8a21fa22b2dadc99fdee29fe5a0a9b Signed-off-by: Michal Skorupinski Signed-off-by: Agnieszka Janowicz --- src/navigator.c | 2 +- src/screen_reader_system.c | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/navigator.c b/src/navigator.c index f1dcaaf..d1362f2 100644 --- a/src/navigator.c +++ b/src/navigator.c @@ -1539,9 +1539,9 @@ static Eina_Bool _is_active_entry(void) g_object_unref(state_set); return EINA_FALSE; } - return EINA_FALSE; DEBUG("END"); + return EINA_FALSE; } static Eina_Bool _is_slider(AtspiAccessible * obj) diff --git a/src/screen_reader_system.c b/src/screen_reader_system.c index 8953a37..1563666 100644 --- a/src/screen_reader_system.c +++ b/src/screen_reader_system.c @@ -285,16 +285,25 @@ void device_battery_get(void) } if (percent == 100) { - if (!asprintf(&buffer, "%s %s", charging_text, _("IDS_SYSTEM_BATTERY_FULLY_CHARGED_STR"))) { + ret = asprintf(&buffer, "%s %s", charging_text, _("IDS_SYSTEM_BATTERY_FULLY_CHARGED_STR")); + if (ret == 0) { + free(buffer); ERROR("Buffer length == 0"); return; + } else if (ret < 0) { + ERROR("Buffer == NULL"); + return; } } else { - if (!asprintf(&buffer, "%s %d %% %s", charging_text, percent, _("IDS_SYSTEM_BATTERY_INFO_BATTERY_STR"))) { + ret = asprintf(&buffer, "%s %d %% %s", charging_text, percent, _("IDS_SYSTEM_BATTERY_INFO_BATTERY_STR")); + if (ret == 0) { + free(buffer); ERROR("Buffer length == 0"); return; + } else if(ret < 0) { + ERROR("Buffer == NULL"); + return; } - } if (!buffer) { @@ -421,8 +430,13 @@ static void _signal_strength_wifi_get(void) if (!ap) { DEBUG("Text to say: %s %s", _("IDS_SYSTEM_NETWORK_TYPE_WIFI"), "Not connected"); - if (!asprintf(&buffer, " %s, %s", _("IDS_SYSTEM_NETWORK_TYPE_WIFI"), "Not connected")) { - ERROR("buffer length == 0"); + ret = asprintf(&buffer, " %s, %s", _("IDS_SYSTEM_NETWORK_TYPE_WIFI"), "Not connected"); + if (ret == 0) { + free(buffer); + ERROR("Buffer length == 0"); + return; + } else if (ret < 0) { + ERROR("Buffer == NULL"); return; } -- 2.7.4