bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* eio: reduce code duplication. 

SVN revision: 53094
This commit is contained in:
Cedric BAIL 2010-10-06 09:54:00 +00:00
parent 4b96e37067
commit 71ae9cd4e5
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/eio/src/lib/eio_dir.c
View File

@ -254,6 +254,14 @@ _eio_dir_copy_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *data
eio_progress_cb(progress, &copy->progress); eio_progress_cb(progress, &copy->progress);
} }
static void
_eio_dir_copy_free(Eio_Dir_Copy *copy)
{
eina_stringshare_del(copy->progress.source);
eina_stringshare_del(copy->progress.dest);
free(copy);
}
static void static void
_eio_dir_copy_end(void *data) _eio_dir_copy_end(void *data)
{ {
@ -261,9 +269,7 @@ _eio_dir_copy_end(void *data)
copy->progress.common.done_cb((void*) copy->progress.common.data); copy->progress.common.done_cb((void*) copy->progress.common.data);
eina_stringshare_del(copy->progress.source); _eio_dir_copy_free(copy);
eina_stringshare_del(copy->progress.dest);
free(copy);
} }
static void static void
@ -273,9 +279,7 @@ _eio_dir_copy_error(void *data)
eio_file_error(&copy->progress.common); eio_file_error(&copy->progress.common);
eina_stringshare_del(copy->progress.source); _eio_dir_copy_free(copy);
eina_stringshare_del(copy->progress.dest);
free(copy);
} }
/** /**

44
legacy/eio/src/lib/eio_file.c
View File

@ -356,6 +356,14 @@ _eio_file_copy_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *dat
eio_progress_cb(msg_data, copy); eio_progress_cb(msg_data, copy);
} }
static void
_eio_file_copy_free(Eio_File_Progress *copy)
{
eina_stringshare_del(copy->source);
eina_stringshare_del(copy->dest);
free(copy);
}
static void static void
_eio_file_copy_end(void *data) _eio_file_copy_end(void *data)
{ {
@ -363,9 +371,7 @@ _eio_file_copy_end(void *data)
copy->common.done_cb((void*) copy->common.data); copy->common.done_cb((void*) copy->common.data);
eina_stringshare_del(copy->source); _eio_file_copy_free(copy);
eina_stringshare_del(copy->dest);
free(copy);
} }
static void static void
@ -375,9 +381,15 @@ _eio_file_copy_error(void *data)
eio_file_error(&copy->common); eio_file_error(&copy->common);
eina_stringshare_del(copy->source); _eio_file_copy_free(copy);
eina_stringshare_del(copy->dest); }
free(copy);
static void
_eio_file_move_free(Eio_File_Move *move)
{
eina_stringshare_del(move->progress.source);
eina_stringshare_del(move->progress.dest);
free(move);
} }
static void static void
@ -395,9 +407,7 @@ _eio_file_move_unlink_done(void *data)
move->progress.common.done_cb((void*) move->progress.common.data); move->progress.common.done_cb((void*) move->progress.common.data);
eina_stringshare_del(move->progress.source); _eio_file_move_free(move);
eina_stringshare_del(move->progress.dest);
free(move);
} }
static void static void
@ -410,9 +420,7 @@ _eio_file_move_unlink_error(int error, void *data)
move->progress.common.error = error; move->progress.common.error = error;
eio_file_error(&move->progress.common); eio_file_error(&move->progress.common);
eina_stringshare_del(move->progress.source); _eio_file_move_free(move);
eina_stringshare_del(move->progress.dest);
free(move);
} }
static void static void
@ -436,9 +444,7 @@ _eio_file_move_copy_error(int error, void *data)
move->progress.common.error = error; move->progress.common.error = error;
eio_file_error(&move->progress.common); eio_file_error(&move->progress.common);
eina_stringshare_del(move->progress.source); _eio_file_move_free(move);
eina_stringshare_del(move->progress.dest);
free(move);
} }
static void static void
@ -467,9 +473,7 @@ _eio_file_move_end(void *data)
move->progress.common.done_cb((void*) move->progress.common.data); move->progress.common.done_cb((void*) move->progress.common.data);
eina_stringshare_del(move->progress.source); _eio_file_move_free(move);
eina_stringshare_del(move->progress.dest);
free(move);
} }
static void static void
@ -504,9 +508,7 @@ _eio_file_move_error(void *data)
eio_file_error(&move->progress.common); eio_file_error(&move->progress.common);
eina_stringshare_del(move->progress.source); _eio_file_move_free(move);
eina_stringshare_del(move->progress.dest);
free(move);
} }
/** /**