Upate the creation of system table with g_hash_table_new_full 76/173476/2
authorYoungHun Kim <yh8004.kim@samsung.com>
Thu, 22 Mar 2018 01:20:14 +0000 (10:20 +0900)
committerYoungHun Kim <yh8004.kim@samsung.com>
Thu, 22 Mar 2018 02:03:15 +0000 (02:03 +0000)
Change-Id: I7205f56d1ea589c02d094145a9f4fa075bf7f38a

server/src/muse_server_system.c

index 924ea0541d52ba0130a719521b019b66d2678489..c9bf802c8509982977c85d69c5e643c3337cce4c 100644 (file)
@@ -36,7 +36,6 @@ static void _ms_external_storage_state_changed_cb(int storage_id, storage_dev_e
 static void _ms_poweroff_state_changed_cb(GDBusConnection *con, const gchar *sender_name, const gchar *object_path,
                        const gchar *interface_name, const gchar *signal_name, GVariant *parameters, gpointer user_data);
 static void _ms_system_unsubscribe_poweroff_state_change(void);
-static gboolean _ms_system_free_key(gpointer key, gpointer value, gpointer user_data);
 static void _ms_system_unsubscribe_poweroff_state_change(void)
 {
        ms_system_t *system = ms_get_instance()->system;
@@ -141,12 +140,6 @@ static void _ms_external_storage_state_changed_cb(int storage_id, storage_dev_e
        g_mutex_unlock(&system->lock);
 }
 
-static gboolean _ms_system_free_key(gpointer key, gpointer value, gpointer user_data)
-{
-       MUSE_G_FREE(key);
-       return TRUE;
-}
-
 void ms_system_init(ms_system_t *system)
 {
        GError *error = NULL;
@@ -163,7 +156,7 @@ void ms_system_init(ms_system_t *system)
                }
        }
 
-       system->platform_info_table = g_hash_table_new(g_str_hash, g_str_equal);
+       system->platform_info_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
        g_return_if_fail(system->platform_info_table);
 
        g_mutex_init(&system->lock);
@@ -182,7 +175,6 @@ void ms_system_deinit(ms_system_t *system)
 
        g_mutex_clear(&system->lock);
 
-       g_hash_table_foreach_remove(system->platform_info_table, _ms_system_free_key, NULL);
        g_hash_table_destroy(system->platform_info_table);
 
        free(system);