From 08ada20d6bd04f2a1ba58167f148b7f6dc6516b1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 30 Aug 2012 12:24:42 +0000 Subject: [PATCH] clean up qa config dd cleanup SVN revision: 75879 --- src/modules/quickaccess/e_mod_config.c | 7 +++---- src/modules/quickaccess/e_mod_main.c | 5 ++--- src/modules/quickaccess/e_mod_main.h | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/modules/quickaccess/e_mod_config.c b/src/modules/quickaccess/e_mod_config.c index 0036f28c8..a6949607a 100644 --- a/src/modules/quickaccess/e_mod_config.c +++ b/src/modules/quickaccess/e_mod_config.c @@ -468,11 +468,10 @@ e_qa_config_dd_new(void) } void * -e_qa_config_dd_free(E_Config_DD *conf_dd) +e_qa_config_dd_free(void) { - free(entry_edd); - free(conf_dd); - entry_edd = conf_edd = NULL; + E_FREE(entry_edd); + E_FREE(conf_edd); return NULL; } diff --git a/src/modules/quickaccess/e_mod_main.c b/src/modules/quickaccess/e_mod_main.c index d096a6d52..ce252a277 100644 --- a/src/modules/quickaccess/e_mod_main.c +++ b/src/modules/quickaccess/e_mod_main.c @@ -71,13 +71,12 @@ e_modapi_shutdown(E_Module *m __UNUSED__) { e_qa_shutdown(); - conf_edd = e_qa_config_dd_free(conf_edd); + conf_edd = e_qa_config_dd_free(); eina_log_domain_unregister(_e_quick_access_log_dom); _e_quick_access_log_dom = -1; e_qa_config_free(qa_config); - free(qa_mod); + E_FREE(qa_mod); qa_config = NULL; - qa_mod = NULL; return 1; } diff --git a/src/modules/quickaccess/e_mod_main.h b/src/modules/quickaccess/e_mod_main.h index f20eb132f..6efc5b123 100644 --- a/src/modules/quickaccess/e_mod_main.h +++ b/src/modules/quickaccess/e_mod_main.h @@ -81,7 +81,7 @@ Eina_Bool e_qa_entry_rename(E_Quick_Access_Entry *entry, const char *name); E_Config_DD *e_qa_config_dd_new(void); void e_qa_config_free(Config *conf); Config *e_qa_config_new(void); -void *e_qa_config_dd_free(E_Config_DD *conf_dd); +void *e_qa_config_dd_free(void); void e_qa_config_entry_free(E_Quick_Access_Entry *entry); void e_qa_config_entry_add(E_Quick_Access_Entry *entry); void e_qa_config_entry_transient_convert(E_Quick_Access_Entry *entry);