From 29befb161db16341a3a2e7c5e3fa2ef8f4c365ae Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Fri, 23 Jan 2009 16:43:14 +0000 Subject: [PATCH] put macro after declarations, otherwise vc++ is not happy SVN revision: 38741 --- legacy/eina/src/lib/eina_file.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/legacy/eina/src/lib/eina_file.c b/legacy/eina/src/lib/eina_file.c index 54c62b8c4c..a2a681e33e 100644 --- a/legacy/eina/src/lib/eina_file.c +++ b/legacy/eina/src/lib/eina_file.c @@ -115,14 +115,14 @@ void *alloca (size_t); EAPI Eina_Bool eina_file_dir_list(const char *dir, Eina_Bool recursive, Eina_File_Dir_List_Cb cb, void *data) { - EINA_SAFETY_ON_NULL_RETURN_VAL(cb, EINA_FALSE); - EINA_SAFETY_ON_NULL_RETURN_VAL(dir, EINA_FALSE); - EINA_SAFETY_ON_TRUE_RETURN_VAL(dir[0] == '\0', EINA_FALSE); - #ifndef _WIN32 struct dirent *de; DIR *d; + EINA_SAFETY_ON_NULL_RETURN_VAL(cb, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(dir, EINA_FALSE); + EINA_SAFETY_ON_TRUE_RETURN_VAL(dir[0] == '\0', EINA_FALSE); + d = opendir(dir); if (!d) return EINA_FALSE; @@ -169,6 +169,10 @@ eina_file_dir_list(const char *dir, Eina_Bool recursive, Eina_File_Dir_List_Cb c TCHAR *tdir; size_t length_dir; + EINA_SAFETY_ON_NULL_RETURN_VAL(cb, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(dir, EINA_FALSE); + EINA_SAFETY_ON_TRUE_RETURN_VAL(dir[0] == '\0', EINA_FALSE); + length_dir = strlen(dir); new_dir = (char *)alloca(length_dir + 5); if (!new_dir) return EINA_FALSE;