enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

stringshare 

SVN revision: 47176
This commit is contained in:
Sebastian Dransfeld 2010-03-13 18:34:30 +00:00
parent 9c495f390d
commit c07e3969ce
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
legacy/efreet/src/lib/efreet.c
View File

@ -14,9 +14,9 @@
static int _efreet_init_count = 0; static int _efreet_init_count = 0;
static int efreet_parsed_locale = 0; static int efreet_parsed_locale = 0;
static char *efreet_lang = NULL; static const char *efreet_lang = NULL;
static char *efreet_lang_country = NULL; static const char *efreet_lang_country = NULL;
static char *efreet_lang_modifier = NULL; static const char *efreet_lang_modifier = NULL;
int _efreet_log_domain_global = -1; int _efreet_log_domain_global = -1;
static void efreet_parse_locale(void); static void efreet_parse_locale(void);
static int efreet_parse_locale_setting(const char *env); static int efreet_parse_locale_setting(const char *env);
@ -105,9 +105,9 @@ efreet_shutdown(void)
eet_shutdown(); eet_shutdown();
eina_shutdown(); eina_shutdown();
IF_FREE(efreet_lang); IF_RELEASE(efreet_lang);
IF_FREE(efreet_lang_country); IF_RELEASE(efreet_lang_country);
IF_FREE(efreet_lang_modifier); IF_RELEASE(efreet_lang_modifier);
efreet_parsed_locale = 0; /* reset this in case they init efreet again */ efreet_parsed_locale = 0; /* reset this in case they init efreet again */
return _efreet_init_count; return _efreet_init_count;
@ -199,7 +199,7 @@ efreet_parse_locale_setting(const char *env)
if (p) if (p)
{ {
*p = '\0'; *p = '\0';
efreet_lang_modifier = strdup(p + 1); efreet_lang_modifier = eina_stringshare_add(p + 1);
found = 1; found = 1;
} }
@ -212,13 +212,13 @@ efreet_parse_locale_setting(const char *env)
if (p) if (p)
{ {
*p = '\0'; *p = '\0';
efreet_lang_country = strdup(p + 1); efreet_lang_country = eina_stringshare_add(p + 1);
found = 1; found = 1;
} }
if (setting && (*setting != '\0')) if (setting && (*setting != '\0'))
{ {
efreet_lang = strdup(setting); efreet_lang = eina_stringshare_add(setting);
found = 1; found = 1;
} }

6
legacy/efreet/src/lib/efreet_utils.c
View File

@ -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_List *efreet_util_cache_glob_list(const char *search, const char *what);
static Eina_Hash *file_id_by_desktop_path = NULL; 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 Eet_File *cache = NULL;
static int init = 0; static int init = 0;
@ -86,7 +86,7 @@ efreet_util_shutdown(void)
eina_log_domain_unregister(_efreet_utils_log_dom); eina_log_domain_unregister(_efreet_utils_log_dom);
IF_FREE_HASH(file_id_by_desktop_path); IF_FREE_HASH(file_id_by_desktop_path);
if (cache) eet_close(cache); if (cache) eet_close(cache);
IF_FREE(cache_file); IF_RELEASE(cache_file);
return init; return init;
} }
@ -115,7 +115,7 @@ efreet_desktop_util_cache_file(void)
else else
snprintf(tmp, sizeof(tmp), "%s/.efreet/desktop_util.cache", home); snprintf(tmp, sizeof(tmp), "%s/.efreet/desktop_util.cache", home);
cache_file = strdup(tmp); cache_file = eina_stringshare_add(tmp);
return cache_file; return cache_file;
} }