diff --git a/legacy/efreet/src/lib/efreet.c b/legacy/efreet/src/lib/efreet.c index 895a57d831..f0da7aa66f 100644 --- a/legacy/efreet/src/lib/efreet.c +++ b/legacy/efreet/src/lib/efreet.c @@ -14,9 +14,9 @@ static int _efreet_init_count = 0; static int efreet_parsed_locale = 0; -static char *efreet_lang = NULL; -static char *efreet_lang_country = NULL; -static char *efreet_lang_modifier = NULL; +static const char *efreet_lang = NULL; +static const char *efreet_lang_country = NULL; +static const char *efreet_lang_modifier = NULL; int _efreet_log_domain_global = -1; static void efreet_parse_locale(void); static int efreet_parse_locale_setting(const char *env); @@ -105,9 +105,9 @@ efreet_shutdown(void) eet_shutdown(); eina_shutdown(); - IF_FREE(efreet_lang); - IF_FREE(efreet_lang_country); - IF_FREE(efreet_lang_modifier); + IF_RELEASE(efreet_lang); + IF_RELEASE(efreet_lang_country); + IF_RELEASE(efreet_lang_modifier); efreet_parsed_locale = 0; /* reset this in case they init efreet again */ return _efreet_init_count; @@ -199,7 +199,7 @@ efreet_parse_locale_setting(const char *env) if (p) { *p = '\0'; - efreet_lang_modifier = strdup(p + 1); + efreet_lang_modifier = eina_stringshare_add(p + 1); found = 1; } @@ -212,13 +212,13 @@ efreet_parse_locale_setting(const char *env) if (p) { *p = '\0'; - efreet_lang_country = strdup(p + 1); + efreet_lang_country = eina_stringshare_add(p + 1); found = 1; } if (setting && (*setting != '\0')) { - efreet_lang = strdup(setting); + efreet_lang = eina_stringshare_add(setting); found = 1; } diff --git a/legacy/efreet/src/lib/efreet_utils.c b/legacy/efreet/src/lib/efreet_utils.c index 603036e685..a0d91949d4 100644 --- a/legacy/efreet/src/lib/efreet_utils.c +++ b/legacy/efreet/src/lib/efreet_utils.c @@ -52,7 +52,7 @@ static Eina_List *efreet_util_cache_list(const char *search, const char *what); static Eina_List *efreet_util_cache_glob_list(const char *search, const char *what); static Eina_Hash *file_id_by_desktop_path = NULL; -static char *cache_file = NULL; +static const char *cache_file = NULL; static Eet_File *cache = NULL; static int init = 0; @@ -86,7 +86,7 @@ efreet_util_shutdown(void) eina_log_domain_unregister(_efreet_utils_log_dom); IF_FREE_HASH(file_id_by_desktop_path); if (cache) eet_close(cache); - IF_FREE(cache_file); + IF_RELEASE(cache_file); return init; } @@ -115,7 +115,7 @@ efreet_desktop_util_cache_file(void) else snprintf(tmp, sizeof(tmp), "%s/.efreet/desktop_util.cache", home); - cache_file = strdup(tmp); + cache_file = eina_stringshare_add(tmp); return cache_file; }