summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2010-03-03 12:28:40 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2010-03-03 12:28:40 +0000
commita1205c588c01e2ca84cfe6eb7ee21dec9ea124b6 (patch)
treeab170e17096352de95d710907faabf4a244e854c
parent4b25daa441d34ff6f74553a1d94be98281de9d9f (diff)
rename function
SVN revision: 46831
-rw-r--r--legacy/efreet/src/bin/efreet_desktop_cache_create.c10
-rw-r--r--legacy/efreet/src/lib/efreet_private.h2
-rw-r--r--legacy/efreet/src/lib/efreet_utils.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/legacy/efreet/src/bin/efreet_desktop_cache_create.c b/legacy/efreet/src/bin/efreet_desktop_cache_create.c
index 444f5a497b..f580483eb1 100644
--- a/legacy/efreet/src/bin/efreet_desktop_cache_create.c
+++ b/legacy/efreet/src/bin/efreet_desktop_cache_create.c
@@ -196,16 +196,16 @@ main()
196 close(fd); 196 close(fd);
197 197
198 /* create dir for util cache */ 198 /* create dir for util cache */
199 dir = ecore_file_dir_get(efreet_util_cache_file()); 199 dir = ecore_file_dir_get(efreet_desktop_util_cache_file());
200 if (!ecore_file_mkpath(dir)) goto efreet_error; 200 if (!ecore_file_mkpath(dir)) goto efreet_error;
201 free(dir); 201 free(dir);
202 /* unlink old cache file */ 202 /* unlink old cache file */
203 if (unlink(efreet_util_cache_file()) < 0) 203 if (unlink(efreet_desktop_util_cache_file()) < 0)
204 { 204 {
205 if (errno != ENOENT) goto efreet_error; 205 if (errno != ENOENT) goto efreet_error;
206 } 206 }
207 /* create util cache file */ 207 /* create util cache file */
208 fd = open(efreet_util_cache_file(), O_CREAT | O_EXCL | O_RDONLY, S_IRUSR | S_IWUSR); 208 fd = open(efreet_desktop_util_cache_file(), O_CREAT | O_EXCL | O_RDONLY, S_IRUSR | S_IWUSR);
209 if (fd < 0) goto efreet_error; 209 if (fd < 0) goto efreet_error;
210 close(fd); 210 close(fd);
211 211
@@ -223,7 +223,7 @@ main()
223 ef = eet_open(file, EET_FILE_MODE_WRITE); 223 ef = eet_open(file, EET_FILE_MODE_WRITE);
224 if (!ef) goto error; 224 if (!ef) goto error;
225 225
226 snprintf(util_file, sizeof(util_file), "%s.XXXXXX", efreet_util_cache_file()); 226 snprintf(util_file, sizeof(util_file), "%s.XXXXXX", efreet_desktop_util_cache_file());
227 tmpfd = mkstemp(util_file); 227 tmpfd = mkstemp(util_file);
228 if (tmpfd < 0) goto error; 228 if (tmpfd < 0) goto error;
229 close(tmpfd); 229 close(tmpfd);
@@ -260,7 +260,7 @@ main()
260 260
261 /* rename tmp files to real files */ 261 /* rename tmp files to real files */
262 if (rename(file, efreet_desktop_cache_file()) < 0) goto error; 262 if (rename(file, efreet_desktop_cache_file()) < 0) goto error;
263 if (rename(util_file, efreet_util_cache_file()) < 0) goto error; 263 if (rename(util_file, efreet_desktop_util_cache_file()) < 0) goto error;
264 264
265 efreet_desktop_edd_shutdown(edd); 265 efreet_desktop_edd_shutdown(edd);
266 efreet_shutdown(); 266 efreet_shutdown();
diff --git a/legacy/efreet/src/lib/efreet_private.h b/legacy/efreet/src/lib/efreet_private.h
index fbb0609b76..13060f9fae 100644
--- a/legacy/efreet/src/lib/efreet_private.h
+++ b/legacy/efreet/src/lib/efreet_private.h
@@ -202,7 +202,7 @@ const char *efreet_desktop_environment_get(void);
202EAPI Eet_Data_Descriptor *efreet_desktop_edd_init(void); 202EAPI Eet_Data_Descriptor *efreet_desktop_edd_init(void);
203EAPI void efreet_desktop_edd_shutdown(Eet_Data_Descriptor *edd); 203EAPI void efreet_desktop_edd_shutdown(Eet_Data_Descriptor *edd);
204 204
205EAPI const char *efreet_util_cache_file(void); 205EAPI const char *efreet_desktop_util_cache_file(void);
206EAPI const char *efreet_desktop_cache_file(void); 206EAPI const char *efreet_desktop_cache_file(void);
207 207
208#define NON_EXISTING (void *)-1 208#define NON_EXISTING (void *)-1
diff --git a/legacy/efreet/src/lib/efreet_utils.c b/legacy/efreet/src/lib/efreet_utils.c
index 5f2d44441a..d17cc79fa4 100644
--- a/legacy/efreet/src/lib/efreet_utils.c
+++ b/legacy/efreet/src/lib/efreet_utils.c
@@ -69,7 +69,7 @@ efreet_util_init(void)
69 } 69 }
70 70
71 /* TODO: Need file monitor on cache in case it is updated */ 71 /* TODO: Need file monitor on cache in case it is updated */
72 cache = eet_open(efreet_util_cache_file(), EET_FILE_MODE_READ); 72 cache = eet_open(efreet_desktop_util_cache_file(), EET_FILE_MODE_READ);
73 if (!cache) goto cache_error; 73 if (!cache) goto cache_error;
74 file_id_by_desktop_path = eina_hash_string_superfast_new(EINA_FREE_CB(eina_stringshare_del)); 74 file_id_by_desktop_path = eina_hash_string_superfast_new(EINA_FREE_CB(eina_stringshare_del));
75 75
@@ -97,7 +97,7 @@ efreet_util_shutdown(void)
97 * Needs EAPI because of helper binaries 97 * Needs EAPI because of helper binaries
98 */ 98 */
99EAPI const char * 99EAPI const char *
100efreet_util_cache_file(void) 100efreet_desktop_util_cache_file(void)
101{ 101{
102 char tmp[PATH_MAX] = { '\0' }; 102 char tmp[PATH_MAX] = { '\0' };
103 const char *home, *lang, *country, *modifier; 103 const char *home, *lang, *country, *modifier;