Integrate bm_atm_free

- st1_free and st2_free are same
- Now, st2_free isn't used
- So, remove one to increase function coverage

Change-Id: Id0cddd8099f3ed0051d30844242ba179df6bb972
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/include/bm_util.h b/include/bm_util.h
index e9b093d..ed3091c 100644 (file)
--- a/include/bm_util.h
+++ b/include/bm_util.h
@@ -53,9 +53,7 @@ const char *bm_get_resource_id_string(gint resource_id);
 
 void bm_data_free(gpointer data);
 
-void bm_atm_st1_free(gpointer data);
-
-void bm_atm_st2_free(gpointer data);
+void bm_atm_free(gpointer data);
 
 void bm_appid_usage_free(appid_usage_s *data);
 

diff --git a/src/bm_power_engine.c b/src/bm_power_engine.c
index cff1ae0..d554408 100644 (file)
--- a/src/bm_power_engine.c
+++ b/src/bm_power_engine.c
@@ -1533,7 +1533,7 @@ int bm_get_data_from_handles(void)
        int ret_val = BATTERY_MONITOR_ERROR_NONE;
        bool mode = false;
 
-       gl_hash = g_hash_table_new_full(g_str_hash, g_str_equal, bm_data_free, bm_atm_st1_free);
+       gl_hash = g_hash_table_new_full(g_str_hash, g_str_equal, bm_data_free, bm_atm_free);
        if (!gl_hash)
                _ERR("Global Hash creation failed");
 

diff --git a/src/bm_util.c b/src/bm_util.c
index cfa8003..ea86712 100644 (file)
--- a/src/bm_util.c
+++ b/src/bm_util.c
@@ -332,22 +332,7 @@ void bm_data_free(gpointer data)
        return;
 }
 
-void bm_atm_st1_free(gpointer data)
-{
-       ENTER;
-
-       if (!data) {
-               _ERR("data handle is null");
-               return;
-       }
-
-       BM_FREE(data);
-
-       EXIT;
-       return;
-}
-
-void bm_atm_st2_free(gpointer data)
+void bm_atm_free(gpointer data)
 {
        ENTER;