Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_file Modified Files: Ecore_File.h ecore_file.c ecore_file_download.c ecore_file_path.c Log Message: *API BREAK* see the discussion in the mailing list. misc and e_modules will follow =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/Ecore_File.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- Ecore_File.h 2 Jun 2007 16:33:42 -0000 1.32 +++ Ecore_File.h 25 Jul 2007 17:00:55 -0000 1.33 @@ -66,8 +66,11 @@ EAPI int ecore_file_symlink (const char *src, const char *dest); EAPI char *ecore_file_realpath (const char *file); EAPI int ecore_file_unlink (const char *file); - EAPI const char *ecore_file_get_file (const char *path); - EAPI char *ecore_file_get_dir (const char *path); +/* NOTE: these aliases will be removed! DO NOT USE THEM */ +#define ecore_file_get_file(path) ecore_file_file_get(path) +#define ecore_file_get_dir(path) ecore_file_dir_get(path) + EAPI const char *ecore_file_file_get (const char *path); + EAPI char *ecore_file_dir_get (const char *path); EAPI int ecore_file_can_read (const char *file); EAPI int ecore_file_can_write (const char *file); =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/ecore_file.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- ecore_file.c 5 Jun 2007 22:12:10 -0000 1.64 +++ ecore_file.c 25 Jul 2007 17:00:55 -0000 1.65 @@ -254,7 +254,7 @@ } EAPI const char * -ecore_file_get_file(const char *path) +ecore_file_file_get(const char *path) { char *result = NULL; @@ -265,7 +265,7 @@ } EAPI char * -ecore_file_get_dir(const char *file) +ecore_file_dir_get(const char *file) { char *p; char buf[PATH_MAX]; @@ -330,7 +330,7 @@ if (!dirp) return NULL; list = ecore_list_new(); - ecore_list_set_free_cb(list, free); + ecore_list_free_cb_set(list, free); while ((dp = readdir(dirp))) { @@ -344,7 +344,7 @@ ecore_list_sort(list, ECORE_COMPARE_CB(strcoll), ECORE_SORT_MIN); - ecore_list_goto_first(list); + ecore_list_first_goto(list); return list; } =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/ecore_file_download.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ecore_file_download.c 16 Jan 2007 10:17:46 -0000 1.14 +++ ecore_file_download.c 25 Jul 2007 17:00:55 -0000 1.15 @@ -62,9 +62,9 @@ #ifdef HAVE_CURL Ecore_File_Download_Job *job; - if (!ecore_list_is_empty(_job_list)) + if (!ecore_list_empty_is(_job_list)) { - ecore_list_goto_first(_job_list); + ecore_list_first_goto(_job_list); while ((job = ecore_list_next(_job_list))) { ecore_main_fd_handler_del(job->fd_handler); @@ -91,7 +91,7 @@ if (!_job_list) return; - ecore_list_goto_first(_job_list); + ecore_list_first_goto(_job_list); while ((job = ecore_list_next(_job_list))) { ecore_main_fd_handler_del(job->fd_handler); @@ -111,7 +111,7 @@ int (*progress_cb)(void *data, const char *file, long int dltotal, long int dlnow, long int ultotal, long int ulnow), void *data) { - if (!ecore_file_is_dir(ecore_file_get_dir((char *)dst))) return 0; + if (!ecore_file_is_dir(ecore_file_dir_get((char *)dst))) return 0; if (ecore_file_exists(dst)) return 0; /* FIXME: Add handlers for http and ftp! */ @@ -249,7 +249,7 @@ if (curlmsg->msg != CURLMSG_DONE) continue; /* find the job which is done */ - ecore_list_goto_first(_job_list); + ecore_list_first_goto(_job_list); while ((current = ecore_list_current(_job_list))) { if (curlmsg->easy_handle == current->curl) @@ -335,7 +335,7 @@ if (curlmsg->msg != CURLMSG_DONE) continue; /* find the job which is done */ - ecore_list_goto_first(_job_list); + ecore_list_first_goto(_job_list); while ((job = ecore_list_current(_job_list))) { if (curlmsg->easy_handle == job->curl) =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/ecore_file_path.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ecore_file_path.c 19 Jan 2007 14:02:34 -0000 1.20 +++ ecore_file_path.c 25 Jul 2007 17:00:55 -0000 1.21 @@ -13,7 +13,7 @@ { if (++init != 1) return init; __ecore_file_path_bin = _ecore_file_path_from_env("PATH"); - ecore_list_set_free_cb(__ecore_file_path_bin, free); + ecore_list_free_cb_set(__ecore_file_path_bin, free); return init; } @@ -65,7 +65,7 @@ char *dir; if (!__ecore_file_path_bin) return 0; - ecore_list_goto_first(__ecore_file_path_bin); + ecore_list_first_goto(__ecore_file_path_bin); while ((dir = ecore_list_next(__ecore_file_path_bin)) != NULL) { if (!strcmp(dir, in_dir)) return 1; @@ -82,7 +82,7 @@ if (!exe) return 0; if (ecore_file_can_exec(exe)) return 1; - ecore_list_goto_first(__ecore_file_path_bin); + ecore_list_first_goto(__ecore_file_path_bin); while ((dir = ecore_list_next(__ecore_file_path_bin)) != NULL) { snprintf(buf, sizeof(buf), "%s/%s", dir, exe); @@ -99,14 +99,14 @@ list = ecore_list_new(); if (!list) return NULL; - ecore_list_set_free_cb(list, free); - ecore_list_goto_first(__ecore_file_path_bin); + ecore_list_free_cb_set(list, free); + ecore_list_first_goto(__ecore_file_path_bin); while ((dir = ecore_list_next(__ecore_file_path_bin)) != NULL) { files = ecore_file_ls(dir); if (files) { - ecore_list_goto_first(files); + ecore_list_first_goto(files); while ((exe = ecore_list_next(files)) != NULL) { snprintf(buf, sizeof(buf), "%s/%s", dir, exe); ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs