From: Enlightenment S. <no-...@en...> - 2010-10-13 00:26:19
|
Log: ok... bad eio hackers. you know setting things like gnu_source and file_offset_bits .. CHANGES the size of structs like dirent? so if u do it differently in different c files... u end up with.. GASP different structs with different sizes! dont do this. unify everything into eio_private.h so its at least CONSISTENT for eio's internals. Author: raster Date: 2010-10-12 17:26:12 -0700 (Tue, 12 Oct 2010) New Revision: 53322 Modified: trunk/eio/src/lib/eio_dir.c trunk/eio/src/lib/eio_file.c trunk/eio/src/lib/eio_main.c trunk/eio/src/lib/eio_private.h trunk/eio/src/lib/eio_single.c Modified: trunk/eio/src/lib/eio_dir.c =================================================================== --- trunk/eio/src/lib/eio_dir.c 2010-10-12 23:46:36 UTC (rev 53321) +++ trunk/eio/src/lib/eio_dir.c 2010-10-13 00:26:12 UTC (rev 53322) @@ -16,36 +16,7 @@ * License along with this library; * if not, see <http://www.gnu.org/licenses/>. */ - -#define _FILE_OFFSET_BITS 64 - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <stdio.h> -#include <string.h> - -#ifndef _MSC_VER -# include <unistd.h> -# include <libgen.h> -#endif - -#ifdef HAVE_FEATURES_H -# include <features.h> -#endif -#include <ctype.h> -#include <errno.h> - -#include <sys/types.h> -#include <sys/stat.h> -#include <dirent.h> -#include <unistd.h> -#include <sys/mman.h> -#include <fcntl.h> - #include "eio_private.h" - #include "Eio.h" static int Modified: trunk/eio/src/lib/eio_file.c =================================================================== --- trunk/eio/src/lib/eio_file.c 2010-10-12 23:46:36 UTC (rev 53321) +++ trunk/eio/src/lib/eio_file.c 2010-10-13 00:26:12 UTC (rev 53322) @@ -18,35 +18,7 @@ * License along with this library; * if not, see <http://www.gnu.org/licenses/>. */ - -#define _FILE_OFFSET_BITS 64 - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <stdio.h> -#include <string.h> - -#ifndef _MSC_VER -# include <unistd.h> -# include <libgen.h> -#endif - -#ifdef HAVE_FEATURES_H -# include <features.h> -#endif -#include <ctype.h> -#include <errno.h> - -#include <sys/types.h> -#include <sys/stat.h> -#include <dirent.h> -#include <sys/mman.h> -#include <fcntl.h> - #include "eio_private.h" - #include "Eio.h" static void Modified: trunk/eio/src/lib/eio_main.c =================================================================== --- trunk/eio/src/lib/eio_main.c 2010-10-12 23:46:36 UTC (rev 53321) +++ trunk/eio/src/lib/eio_main.c 2010-10-13 00:26:12 UTC (rev 53322) @@ -16,16 +16,7 @@ * License along with this library; * if not, see <http://www.gnu.org/licenses/>. */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <pthread.h> -#include <dirent.h> - #include "eio_private.h" - #include "Eio.h" static int _eio_count = 0; Modified: trunk/eio/src/lib/eio_private.h =================================================================== --- trunk/eio/src/lib/eio_private.h 2010-10-12 23:46:36 UTC (rev 53321) +++ trunk/eio/src/lib/eio_private.h 2010-10-13 00:26:12 UTC (rev 53322) @@ -1,12 +1,41 @@ #ifndef EIO_PRIVATE_H_ #define EIO_PRIVATE_H_ -#include <Ecore.h> +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#ifndef _GNU_SOURCE +# define _GNU_SOURCE +#endif + +#ifdef HAVE_FEATURES_H +# include <features.h> +#endif + +#ifndef _FILE_OFFSET_BITS +# define _FILE_OFFSET_BITS 64 +#endif + +#include <stdio.h> +#include <string.h> + +#ifndef _MSC_VER +# include <unistd.h> +# include <libgen.h> +#endif + +#include <ctype.h> +#include <errno.h> #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> +#include <dirent.h> +#include <sys/mman.h> +#include <fcntl.h> +#include <pthread.h> +#include <Ecore.h> + #include "Eio.h" /* Keeping 32 Eio_File_Progress alive should be enought */ Modified: trunk/eio/src/lib/eio_single.c =================================================================== --- trunk/eio/src/lib/eio_single.c 2010-10-12 23:46:36 UTC (rev 53321) +++ trunk/eio/src/lib/eio_single.c 2010-10-13 00:26:12 UTC (rev 53322) @@ -18,15 +18,7 @@ * License along with this library; * if not, see <http://www.gnu.org/licenses/>. */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <errno.h> - #include "eio_private.h" - #include "Eio.h" void |
From: Enlightenment S. <no-...@en...> - 2010-10-30 05:59:45
|
Log: use new type member. Author: raster Date: 2010-10-29 22:59:39 -0700 (Fri, 29 Oct 2010) New Revision: 54018 Modified: trunk/eio/src/lib/eio_dir.c Modified: trunk/eio/src/lib/eio_dir.c =================================================================== --- trunk/eio/src/lib/eio_dir.c 2010-10-30 05:57:08 UTC (rev 54017) +++ trunk/eio/src/lib/eio_dir.c 2010-10-30 05:59:39 UTC (rev 54018) @@ -133,9 +133,9 @@ EINA_ITERATOR_FOREACH(it, info) { - switch (info->dirent->d_type) + switch (info->type) { - case DT_UNKNOWN: + case EINA_FILE_UNKNOWN: if (stat(info->path, &buffer) != 0) { eio_file_thread_error(©->progress.common, thread); @@ -147,7 +147,7 @@ else copy->files = eina_list_append(copy->files, eina_stringshare_add(info->path)); break; - case DT_DIR: + case EINA_FILE_DIR: dirs = eina_list_append(dirs, eina_stringshare_add(info->path)); break; default: |