From 74b38070b65c9d3e5dcb28f5e81d67a4d8a795ad Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 20 Jun 2012 18:11:20 +0000 Subject: [PATCH] use proper filter callback type for eio_dir_stat_ls(). The user is not supposed to change info as it's already fully populated by stat(). SVN revision: 72551 --- legacy/eio/src/lib/Eio.h | 2 +- legacy/eio/src/lib/eio_dir.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/legacy/eio/src/lib/Eio.h b/legacy/eio/src/lib/Eio.h index 405375175e..e0ceff4a33 100644 --- a/legacy/eio/src/lib/Eio.h +++ b/legacy/eio/src/lib/Eio.h @@ -260,7 +260,7 @@ EAPI Eio_File *eio_file_stat_ls(const char *dir, * ignore it. */ EAPI Eio_File *eio_dir_stat_ls(const char *dir, - Eio_Filter_Dir_Cb filter_cb, + Eio_Filter_Direct_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 a1c17877e6..40d2b6a670 100644 --- a/legacy/eio/src/lib/eio_dir.c +++ b/legacy/eio/src/lib/eio_dir.c @@ -929,7 +929,7 @@ eio_dir_unlink(const char *path, EAPI Eio_File * eio_dir_stat_ls(const char *dir, - Eio_Filter_Dir_Cb filter_cb, + Eio_Filter_Direct_Cb filter_cb, Eio_Main_Direct_Cb main_cb, Eio_Done_Cb done_cb, Eio_Error_Cb error_cb, @@ -945,7 +945,12 @@ eio_dir_stat_ls(const char *dir, async = malloc(sizeof(Eio_File_Dir_Ls)); EINA_SAFETY_ON_NULL_RETURN_VAL(async, NULL); - async->filter_cb = filter_cb; + /* Eio_Filter_Direct_Cb must be casted to Eio_Filter_Dir_Cb here + * because we keep the Eio_File_Dir_Ls pointing to that variant + * where info can be modified, but in our case it's already doing + * stat() then it shouldn't be needed! + */ + async->filter_cb = (Eio_Filter_Dir_Cb)filter_cb; async->main_cb = main_cb; async->ls.directory = eina_stringshare_add(dir);