From a1ea2ed6cd43cada10b6872a23329e651cd44d06 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 5 Oct 2010 15:32:24 +0000 Subject: [PATCH] * eio: more code to share. SVN revision: 53065 --- legacy/eio/src/lib/eio_file.c | 12 ++++++------ legacy/eio/src/lib/eio_private.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/legacy/eio/src/lib/eio_file.c b/legacy/eio/src/lib/eio_file.c index d5b3b0ac40..675107626e 100644 --- a/legacy/eio/src/lib/eio_file.c +++ b/legacy/eio/src/lib/eio_file.c @@ -183,8 +183,8 @@ _eio_file_write(int fd, void *mem, ssize_t length) return EINA_TRUE; } -static void -_eio_file_progress(Eio_Progress *progress, Eio_File_Progress *op) +void +eio_progress_cb(Eio_Progress *progress, Eio_File_Progress *op) { op->progress_cb((void *) op->common.data, progress); @@ -295,7 +295,7 @@ eio_file_copy_do(Ecore_Thread *thread, Eio_File_Progress *copy) if (in < 0) { eio_file_thread_error(©->common); - return ; + return EINA_FALSE; } /* @@ -353,7 +353,7 @@ _eio_file_copy_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *dat { Eio_File_Progress *copy = data; - _eio_file_progress(msg_data, copy); + eio_progress_cb(msg_data, copy); } static void @@ -457,7 +457,7 @@ _eio_file_move_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *dat { Eio_File_Move *move = data; - _eio_file_progress(msg_data, &move->progress); + eio_progress_cb(msg_data, &move->progress); } static void @@ -642,7 +642,7 @@ eio_file_copy(const char *source, copy = malloc(sizeof (Eio_File_Progress)); if (!copy) return NULL; - move->op = EIO_FILE_COPY; + copy->op = EIO_FILE_COPY; copy->progress_cb = progress_cb; copy->source = eina_stringshare_add(source); copy->dest = eina_stringshare_add(dest); diff --git a/legacy/eio/src/lib/eio_private.h b/legacy/eio/src/lib/eio_private.h index d4d8ab30d0..1c5ad6c998 100644 --- a/legacy/eio/src/lib/eio_private.h +++ b/legacy/eio/src/lib/eio_private.h @@ -138,6 +138,8 @@ Eio_Progress *eio_progress_malloc(void); void eio_progress_free(Eio_Progress *progress); void eio_progress_send(Ecore_Thread *thread, Eio_File_Progress *op, off_t current, off_t max); +void eio_progress_cb(Eio_Progress *progress, Eio_File_Progress *op); + Eina_Bool eio_file_copy_do(Ecore_Thread *thread, Eio_File_Progress *copy); #endif