summaryrefslogtreecommitdiff
path: root/src/bin/e_path.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/e_path.c')
-rw-r--r--src/bin/e_path.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index 3c34f7a..e81ffaf 100644
--- a/src/bin/e_path.c
+++ b/src/bin/e_path.c
@@ -47,7 +47,7 @@ e_path_default_path_append(E_Path *ep, const char *path)
47 strcat(new_path, path + 1); 47 strcat(new_path, path + 1);
48 epd->dir = eina_stringshare_add(new_path); 48 epd->dir = eina_stringshare_add(new_path);
49 free(new_path); 49 free(new_path);
50 ep->default_dir_list = evas_list_append(ep->default_dir_list, epd); 50 ep->default_dir_list = eina_list_append(ep->default_dir_list, epd);
51 } 51 }
52 else 52 else
53 { 53 {
@@ -56,13 +56,13 @@ e_path_default_path_append(E_Path *ep, const char *path)
56 if (!epd) 56 if (!epd)
57 return; 57 return;
58 epd->dir = eina_stringshare_add(path); 58 epd->dir = eina_stringshare_add(path);
59 ep->default_dir_list = evas_list_append(ep->default_dir_list, epd); 59 ep->default_dir_list = eina_list_append(ep->default_dir_list, epd);
60 } 60 }
61 _e_path_cache_free(ep); 61 _e_path_cache_free(ep);
62} 62}
63 63
64EAPI void 64EAPI void
65e_path_user_path_set(E_Path *ep, Evas_List **user_dir_list) 65e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list)
66{ 66{
67 E_OBJECT_CHECK(ep); 67 E_OBJECT_CHECK(ep);
68 E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE); 68 E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE);
@@ -100,7 +100,7 @@ e_path_user_path_append(E_Path *ep, const char *path)
100 strcat(new_path, path + 1); 100 strcat(new_path, path + 1);
101 epd->dir = eina_stringshare_add(new_path); 101 epd->dir = eina_stringshare_add(new_path);
102 free(new_path); 102 free(new_path);
103 *(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd); 103 *(ep->user_dir_list) = eina_list_append(*(ep->user_dir_list), epd);
104 } 104 }
105 else 105 else
106 { 106 {
@@ -109,7 +109,7 @@ e_path_user_path_append(E_Path *ep, const char *path)
109 if (!epd) 109 if (!epd)
110 return; 110 return;
111 epd->dir = eina_stringshare_add(path); 111 epd->dir = eina_stringshare_add(path);
112 *(ep->user_dir_list) = evas_list_append(*(ep->user_dir_list), epd); 112 *(ep->user_dir_list) = eina_list_append(*(ep->user_dir_list), epd);
113 } 113 }
114 _e_path_cache_free(ep); 114 _e_path_cache_free(ep);
115} 115}
@@ -143,7 +143,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
143 strcat(new_path, path + 1); 143 strcat(new_path, path + 1);
144 epd->dir = eina_stringshare_add(new_path); 144 epd->dir = eina_stringshare_add(new_path);
145 free(new_path); 145 free(new_path);
146 *(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd); 146 *(ep->user_dir_list) = eina_list_prepend(*(ep->user_dir_list), epd);
147 } 147 }
148 else 148 else
149 { 149 {
@@ -152,7 +152,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
152 if (!epd) 152 if (!epd)
153 return; 153 return;
154 epd->dir = eina_stringshare_add(path); 154 epd->dir = eina_stringshare_add(path);
155 *(ep->user_dir_list) = evas_list_prepend(*(ep->user_dir_list), epd); 155 *(ep->user_dir_list) = eina_list_prepend(*(ep->user_dir_list), epd);
156 } 156 }
157 _e_path_cache_free(ep); 157 _e_path_cache_free(ep);
158} 158}
@@ -160,7 +160,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path)
160EAPI void 160EAPI void
161e_path_user_path_remove(E_Path *ep, const char *path) 161e_path_user_path_remove(E_Path *ep, const char *path)
162{ 162{
163 Evas_List *l; 163 Eina_List *l;
164 164
165 E_OBJECT_CHECK(ep); 165 E_OBJECT_CHECK(ep);
166 E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE); 166 E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE);
@@ -187,7 +187,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
187 { 187 {
188 if (!strcmp(epd->dir, new_path)) 188 if (!strcmp(epd->dir, new_path))
189 { 189 {
190 *(ep->user_dir_list) = evas_list_remove_list( 190 *(ep->user_dir_list) = eina_list_remove_list(
191 *(ep->user_dir_list), l); 191 *(ep->user_dir_list), l);
192 eina_stringshare_del(epd->dir); 192 eina_stringshare_del(epd->dir);
193 free(epd); 193 free(epd);
@@ -209,7 +209,7 @@ e_path_user_path_remove(E_Path *ep, const char *path)
209 { 209 {
210 if (!strcmp(epd->dir, path)) 210 if (!strcmp(epd->dir, path))
211 { 211 {
212 *(ep->user_dir_list) = evas_list_remove_list( 212 *(ep->user_dir_list) = eina_list_remove_list(
213 *(ep->user_dir_list), l); 213 *(ep->user_dir_list), l);
214 eina_stringshare_del(epd->dir); 214 eina_stringshare_del(epd->dir);
215 free(epd); 215 free(epd);
@@ -228,7 +228,7 @@ e_path_user_path_clear(E_Path *ep)
228 { 228 {
229 E_Path_Dir *epd; 229 E_Path_Dir *epd;
230 epd = (*(ep->user_dir_list))->data; 230 epd = (*(ep->user_dir_list))->data;
231 *(ep->user_dir_list) = evas_list_remove_list(*(ep->user_dir_list), *(ep->user_dir_list)); 231 *(ep->user_dir_list) = eina_list_remove_list(*(ep->user_dir_list), *(ep->user_dir_list));
232 eina_stringshare_del(epd->dir); 232 eina_stringshare_del(epd->dir);
233 free(epd); 233 free(epd);
234 } 234 }
@@ -238,7 +238,7 @@ e_path_user_path_clear(E_Path *ep)
238EAPI const char * 238EAPI const char *
239e_path_find(E_Path *ep, const char *file) 239e_path_find(E_Path *ep, const char *file)
240{ 240{
241 Evas_List *l; 241 Eina_List *l;
242 char *str; 242 char *str;
243 char buf[PATH_MAX] = ""; 243 char buf[PATH_MAX] = "";
244 244
@@ -292,8 +292,8 @@ e_path_find(E_Path *ep, const char *file)
292EAPI void 292EAPI void
293e_path_evas_append(E_Path *ep, Evas *evas) 293e_path_evas_append(E_Path *ep, Evas *evas)
294{ 294{
295 Evas_List *l; 295 Eina_List *l;
296 Evas_List *dir_list; 296 Eina_List *dir_list;
297 297
298 E_OBJECT_CHECK(ep); 298 E_OBJECT_CHECK(ep);
299 E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE); 299 E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE);
@@ -310,15 +310,15 @@ e_path_evas_append(E_Path *ep, Evas *evas)
310 eina_stringshare_del(epd->dir); 310 eina_stringshare_del(epd->dir);
311 free(epd); 311 free(epd);
312 } 312 }
313 if (dir_list) evas_list_free(dir_list); 313 if (dir_list) eina_list_free(dir_list);
314} 314}
315 315
316/* combine default_list and and user_list in and easy to use list */ 316/* combine default_list and and user_list in and easy to use list */
317EAPI Evas_List * 317EAPI Eina_List *
318e_path_dir_list_get(E_Path *ep) 318e_path_dir_list_get(E_Path *ep)
319{ 319{
320 Evas_List *dir_list; 320 Eina_List *dir_list;
321 Evas_List *l; 321 Eina_List *l;
322 E_Path_Dir *new_epd; 322 E_Path_Dir *new_epd;
323 E_Path_Dir *epd; 323 E_Path_Dir *epd;
324 324
@@ -331,7 +331,7 @@ e_path_dir_list_get(E_Path *ep)
331 epd = l->data; 331 epd = l->data;
332 new_epd = malloc(sizeof(E_Path_Dir)); 332 new_epd = malloc(sizeof(E_Path_Dir));
333 new_epd->dir = eina_stringshare_add(epd->dir); 333 new_epd->dir = eina_stringshare_add(epd->dir);
334 dir_list = evas_list_append(dir_list, new_epd); 334 dir_list = eina_list_append(dir_list, new_epd);
335 } 335 }
336 } 336 }
337 337
@@ -340,21 +340,21 @@ e_path_dir_list_get(E_Path *ep)
340 epd = l->data; 340 epd = l->data;
341 new_epd = malloc(sizeof(E_Path_Dir)); 341 new_epd = malloc(sizeof(E_Path_Dir));
342 new_epd->dir = eina_stringshare_add(epd->dir); 342 new_epd->dir = eina_stringshare_add(epd->dir);
343 dir_list = evas_list_append(dir_list, new_epd); 343 dir_list = eina_list_append(dir_list, new_epd);
344 } 344 }
345 345
346 return dir_list; 346 return dir_list;
347} 347}
348 348
349EAPI void 349EAPI void
350e_path_dir_list_free(Evas_List *dir_list) 350e_path_dir_list_free(Eina_List *dir_list)
351{ 351{
352 E_Path_Dir *epd; 352 E_Path_Dir *epd;
353 353
354 while (dir_list) 354 while (dir_list)
355 { 355 {
356 epd = dir_list->data; 356 epd = dir_list->data;
357 dir_list = evas_list_remove_list(dir_list, dir_list); 357 dir_list = eina_list_remove_list(dir_list, dir_list);
358 eina_stringshare_del(epd->dir); 358 eina_stringshare_del(epd->dir);
359 free(epd); 359 free(epd);
360 } 360 }
@@ -371,7 +371,7 @@ _e_path_free(E_Path *ep)
371 epd = ep->default_dir_list->data; 371 epd = ep->default_dir_list->data;
372 eina_stringshare_del(epd->dir); 372 eina_stringshare_del(epd->dir);
373 free(epd); 373 free(epd);
374 ep->default_dir_list = evas_list_remove_list(ep->default_dir_list, 374 ep->default_dir_list = eina_list_remove_list(ep->default_dir_list,
375 ep->default_dir_list); 375 ep->default_dir_list);
376 } 376 }
377 free(ep); 377 free(ep);