From 422de4f2e5a8bbeb64c98c02f2b6e074b97125c3 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 22 Feb 2012 11:51:45 +0000 Subject: [PATCH] eio: change callback prototype. SVN revision: 68265 --- legacy/eio/src/lib/Eio.h | 5 +++-- legacy/eio/src/lib/eio_dir.c | 22 +++++++++++----------- legacy/eio/src/lib/eio_private.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/legacy/eio/src/lib/Eio.h b/legacy/eio/src/lib/Eio.h index 7f1073a62c..edd0961da9 100644 --- a/legacy/eio/src/lib/Eio.h +++ b/legacy/eio/src/lib/Eio.h @@ -119,6 +119,7 @@ typedef Eina_Bool (*Eio_Filter_Cb)(void *data, Eio_File *handler, const char *fi typedef void (*Eio_Main_Cb)(void *data, Eio_File *handler, const char *file); typedef Eina_Bool (*Eio_Filter_Direct_Cb)(void *data, Eio_File *handler, const Eina_File_Direct_Info *info); +typedef Eina_Bool (*Eio_Filter_Dir_Cb)(void *data, Eio_File *handler, Eina_File_Direct_Info *info); typedef void (*Eio_Main_Direct_Cb)(void *data, Eio_File *handler, const Eina_File_Direct_Info *info); typedef void (*Eio_Stat_Cb)(void *data, Eio_File *handler, const struct stat *stat); @@ -238,7 +239,7 @@ EAPI Eio_File *eio_file_stat_ls(const char *dir, * ecore_thread_feedback_run. This prevent any lock in your apps. */ EAPI Eio_File *eio_dir_stat_ls(const char *dir, - Eio_Filter_Direct_Cb filter_cb, + Eio_Filter_Dir_Cb filter_cb, Eio_Main_Direct_Cb main_cb, Eio_Done_Cb done_cb, Eio_Error_Cb error_cb, @@ -258,7 +259,7 @@ EAPI Eio_File *eio_dir_stat_ls(const char *dir, * ecore_thread_feedback_run. This prevent any lock in your apps. */ EAPI Eio_File *eio_dir_direct_ls(const char *dir, - Eio_Filter_Direct_Cb filter_cb, + Eio_Filter_Dir_Cb filter_cb, Eio_Main_Direct_Cb main_cb, Eio_Done_Cb done_cb, Eio_Error_Cb error_cb, diff --git a/legacy/eio/src/lib/eio_dir.c b/legacy/eio/src/lib/eio_dir.c index d0f29c0409..227418c048 100644 --- a/legacy/eio/src/lib/eio_dir.c +++ b/legacy/eio/src/lib/eio_dir.c @@ -669,9 +669,9 @@ _eio_dir_rmrf_heavy(void *data, Ecore_Thread *thread) } static Eina_Bool -_eio_dir_stat_find_forward(Eio_File_Direct_Ls *async, +_eio_dir_stat_find_forward(Eio_File_Dir_Ls *async, Eio_File *handler, - const Eina_File_Direct_Info *info) + Eina_File_Direct_Info *info) { Eina_Bool filter = EINA_TRUE; double current; @@ -714,7 +714,7 @@ _eio_dir_stat_find_forward(Eio_File_Direct_Ls *async, static void _eio_dir_stat_find_heavy(void *data, Ecore_Thread *thread) { - Eio_File_Direct_Ls *async = data; + Eio_File_Dir_Ls *async = data; async->ls.common.thread = thread; async->pack = NULL; @@ -732,7 +732,7 @@ _eio_dir_stat_find_heavy(void *data, Ecore_Thread *thread) static void _eio_dir_direct_find_heavy(void *data, Ecore_Thread *thread) { - Eio_File_Direct_Ls *async = data; + Eio_File_Dir_Ls *async = data; async->ls.common.thread = thread; async->pack = NULL; @@ -750,7 +750,7 @@ _eio_dir_direct_find_heavy(void *data, Ecore_Thread *thread) static void _eio_dir_stat_find_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data) { - Eio_File_Direct_Ls *async = data; + Eio_File_Dir_Ls *async = data; Eina_List *pack = msg_data; Eio_File_Direct_Info *info; @@ -929,20 +929,20 @@ eio_dir_unlink(const char *path, EAPI Eio_File * eio_dir_stat_ls(const char *dir, - Eio_Filter_Direct_Cb filter_cb, + Eio_Filter_Dir_Cb filter_cb, Eio_Main_Direct_Cb main_cb, Eio_Done_Cb done_cb, Eio_Error_Cb error_cb, const void *data) { - Eio_File_Direct_Ls *async; + Eio_File_Dir_Ls *async; EINA_SAFETY_ON_NULL_RETURN_VAL(dir, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(main_cb, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL); - async = malloc(sizeof(Eio_File_Direct_Ls)); + async = malloc(sizeof(Eio_File_Dir_Ls)); EINA_SAFETY_ON_NULL_RETURN_VAL(async, NULL); async->filter_cb = filter_cb; @@ -964,20 +964,20 @@ eio_dir_stat_ls(const char *dir, EAPI Eio_File * eio_dir_direct_ls(const char *dir, - Eio_Filter_Direct_Cb filter_cb, + Eio_Filter_Dir_Cb filter_cb, Eio_Main_Direct_Cb main_cb, Eio_Done_Cb done_cb, Eio_Error_Cb error_cb, const void *data) { - Eio_File_Direct_Ls *async; + Eio_File_Dir_Ls *async; EINA_SAFETY_ON_NULL_RETURN_VAL(dir, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(main_cb, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL); - async = malloc(sizeof(Eio_File_Direct_Ls)); + async = malloc(sizeof(Eio_File_Dir_Ls)); EINA_SAFETY_ON_NULL_RETURN_VAL(async, NULL); async->filter_cb = filter_cb; diff --git a/legacy/eio/src/lib/eio_private.h b/legacy/eio/src/lib/eio_private.h index 42da6cade6..69dee463d8 100644 --- a/legacy/eio/src/lib/eio_private.h +++ b/legacy/eio/src/lib/eio_private.h @@ -60,6 +60,7 @@ typedef struct _Eio_File_Map Eio_File_Map; typedef struct _Eio_File_Map_Rule Eio_File_Map_Rule; typedef struct _Eio_File_Ls Eio_File_Ls; typedef struct _Eio_File_Direct_Ls Eio_File_Direct_Ls; +typedef struct _Eio_File_Dir_Ls Eio_File_Dir_Ls; typedef struct _Eio_File_Char_Ls Eio_File_Char_Ls; typedef struct _Eio_File_Mkdir Eio_File_Mkdir; typedef struct _Eio_File_Mkdir Eio_File_Chmod; @@ -234,6 +235,17 @@ struct _Eio_File_Direct_Ls double start; }; +struct _Eio_File_Dir_Ls +{ + Eio_File_Ls ls; + + Eio_Filter_Dir_Cb filter_cb; + Eio_Main_Direct_Cb main_cb; + + Eina_List *pack; + double start; +}; + struct _Eio_File_Char_Ls { Eio_File_Ls ls;