SVACE Fixes & code organization

Change-Id: Ide9687083f9791bbc0c041ccde95c1d577dc12cb
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

diff --git a/src/battery_dump/bd_history_item.c b/src/battery_dump/bd_history_item.c
index 9968094..9961c95 100644 (file)
--- a/src/battery_dump/bd_history_item.c
+++ b/src/battery_dump/bd_history_item.c
@@ -216,6 +216,7 @@ static int bd_get_and_print_battery_usage_from_dump(int fd, long int duration)
                appid_usage_s *app_use = bm_server_query_app_usage_by_appid(appid, 1, &ret);
                if (app_use == NULL || ret != BATTERY_MONITOR_ERROR_NONE) {
                        _ERR("For appid %s", appid);
+                       bm_appid_usage_free(app_use);
                        continue;
                }
                usageMAh = (app_use->rId_ble + app_use->rId_wifi + app_use->rId_cpu +
@@ -249,6 +250,7 @@ static int bd_get_and_print_battery_usage_from_dump(int fd, long int duration)
                        bm_server_query_resource_usage_resourceid(rid_str, 1, &ret);
                if (res_use == NULL || ret != BATTERY_MONITOR_ERROR_NONE) {
                        _ERR("For resourceid %s", rid_str);
+                       bm_resourceid_usage_free(res_use);
                        continue;
                }
                dump_p = g_string_sized_new(30);

diff --git a/src/bm_server_db.c b/src/bm_server_db.c
index 4c3d9ac..ba0e41b 100644 (file)
--- a/src/bm_server_db.c
+++ b/src/bm_server_db.c
@@ -53,7 +53,7 @@ static int bm_db_err_code(sqlite3 *bm_db_handle)
        return sqlite3_errcode(bm_db_handle);
 }
 
-char* bm_dup_text(const char *text_data)
+/* char* bm_dup_text(const char *text_data)
 {
        ENTER;
 
@@ -64,7 +64,7 @@ char* bm_dup_text(const char *text_data)
 
        EXIT;
        return text_value;
-}
+}*/
 
 static bm_stmt bm_prepare_query(sqlite3 *bm_db_handle, char *query)
 {
@@ -2049,8 +2049,13 @@ appid_usage_s *bm_server_query_app_usage_by_appid(const char *app_id, int period
        appid_usage_s *bm_app_type = NULL;
        *error_code = BATTERY_MONITOR_ERROR_NONE;
 
-       BM_RETURN_VAL((g_hBatteryMonitorDB != NULL), { *error_code =  BATTERY_MONITOR_ERROR_DB_NOT_OPENED; }, NULL, ("The database isn't connected."));
-       BM_RETURN_VAL((app_id != NULL), { *error_code = BATTERY_MONITOR_ERROR_INVALID_PARAMETER; }, NULL, ("The Battery Monitor Handle is NULL"));
+       BM_RETURN_VAL((g_hBatteryMonitorDB != NULL), \
+                       { *error_code =  BATTERY_MONITOR_ERROR_DB_NOT_OPENED; }, \
+                       NULL, ("The database isn't connected."));
+
+       BM_RETURN_VAL((app_id != NULL), \
+                       { *error_code = BATTERY_MONITOR_ERROR_INVALID_PARAMETER; }, \
+                       NULL, ("The Battery Monitor Handle is NULL"));
 
        bm_app_type = bm_query_usage_by_appid(g_hBatteryMonitorDB, app_id, error_code, period_type);
 
@@ -2065,10 +2070,16 @@ resourceid_usage_s *bm_server_query_resource_usage_resourceid(const char *resour
        resourceid_usage_s *bm_resource_type = NULL;
        *error_code = BATTERY_MONITOR_ERROR_NONE;
 
-       BM_RETURN_VAL((g_hBatteryMonitorDB != NULL), { *error_code = BATTERY_MONITOR_ERROR_DB_NOT_OPENED; }, NULL, ("The database isn't connected."));
-       BM_RETURN_VAL((resource_id != NULL), { *error_code = BATTERY_MONITOR_ERROR_INVALID_PARAMETER; }, NULL, ("The Battery Monitor Handle is NULL"));
+       BM_RETURN_VAL((g_hBatteryMonitorDB != NULL), \
+                       { *error_code = BATTERY_MONITOR_ERROR_DB_NOT_OPENED; }, \
+                       NULL, ("The database isn't connected."));
 
-       bm_resource_type = bm_query_usage_by_resourceid(g_hBatteryMonitorDB, resource_id, error_code, period_type);
+       BM_RETURN_VAL((resource_id != NULL), \
+                       { *error_code = BATTERY_MONITOR_ERROR_INVALID_PARAMETER; }, \
+                       NULL, ("The Battery Monitor Handle is NULL"));
+
+       bm_resource_type = bm_query_usage_by_resourceid(g_hBatteryMonitorDB, resource_id, \
+                                                                       error_code, period_type);
 
        EXIT;
        return bm_resource_type;
@@ -2081,7 +2092,10 @@ GSList* bm_server_query_appid_map(int *error_code)
        GSList *list = NULL;
        *error_code = BATTERY_MONITOR_ERROR_NONE;
 
-       BM_RETURN_VAL((g_hBatteryMonitorDB != NULL), { *error_code = BATTERY_MONITOR_ERROR_DB_NOT_OPENED; }, NULL, ("The database isn't connected."));
+       BM_RETURN_VAL((g_hBatteryMonitorDB != NULL), \
+                       { *error_code = BATTERY_MONITOR_ERROR_DB_NOT_OPENED; }, \
+                       NULL, ("The database isn't connected."));
+
        list = bm_query_appid_map(g_hBatteryMonitorDB, error_code);
 
        EXIT;