summaryrefslogtreecommitdiff
path: root/legacy/eio/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2010-11-12 13:28:19 +0000
committerCedric BAIL <cedric.bail@free.fr>2010-11-12 13:28:19 +0000
commite61f8560ea08e64e450c8cc84c0147e1727ade24 (patch)
tree295f2e40d640663d4081675280fbf43cae1180be /legacy/eio/src
parent0bc55e69b224c50fdadb9abd6208fbf4ac365e08 (diff)
* ecore: break Ecore_Thread API once and for all to make it consistent.
SVN revision: 54502
Diffstat (limited to 'legacy/eio/src')
-rw-r--r--legacy/eio/src/lib/eio_dir.c12
-rw-r--r--legacy/eio/src/lib/eio_file.c30
-rw-r--r--legacy/eio/src/lib/eio_private.h12
-rw-r--r--legacy/eio/src/lib/eio_single.c40
4 files changed, 47 insertions, 47 deletions
diff --git a/legacy/eio/src/lib/eio_dir.c b/legacy/eio/src/lib/eio_dir.c
index 288c628c5e..2d0a238bd6 100644
--- a/legacy/eio/src/lib/eio_dir.c
+++ b/legacy/eio/src/lib/eio_dir.c
@@ -389,7 +389,7 @@ _eio_dir_chmod(Ecore_Thread *thread, Eio_Dir_Copy *order,
389} 389}
390 390
391static void 391static void
392_eio_dir_copy_heavy(Ecore_Thread *thread, void *data) 392_eio_dir_copy_heavy(void *data, Ecore_Thread *thread)
393{ 393{
394 Eio_Dir_Copy *copy = data; 394 Eio_Dir_Copy *copy = data;
395 const char *file = NULL; 395 const char *file = NULL;
@@ -475,7 +475,7 @@ _eio_dir_copy_heavy(Ecore_Thread *thread, void *data)
475} 475}
476 476
477static void 477static void
478_eio_dir_copy_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *data) 478_eio_dir_copy_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
479{ 479{
480 Eio_Dir_Copy *copy = data; 480 Eio_Dir_Copy *copy = data;
481 Eio_Progress *progress = msg_data; 481 Eio_Progress *progress = msg_data;
@@ -492,7 +492,7 @@ _eio_dir_copy_free(Eio_Dir_Copy *copy)
492} 492}
493 493
494static void 494static void
495_eio_dir_copy_end(void *data) 495_eio_dir_copy_end(void *data, Ecore_Thread *thread __UNUSED__)
496{ 496{
497 Eio_Dir_Copy *copy = data; 497 Eio_Dir_Copy *copy = data;
498 498
@@ -502,7 +502,7 @@ _eio_dir_copy_end(void *data)
502} 502}
503 503
504static void 504static void
505_eio_dir_copy_error(void *data) 505_eio_dir_copy_error(void *data, Ecore_Thread *thread __UNUSED__)
506{ 506{
507 Eio_Dir_Copy *copy = data; 507 Eio_Dir_Copy *copy = data;
508 508
@@ -512,7 +512,7 @@ _eio_dir_copy_error(void *data)
512} 512}
513 513
514static void 514static void
515_eio_dir_move_heavy(Ecore_Thread *thread, void *data) 515_eio_dir_move_heavy(void *data, Ecore_Thread *thread)
516{ 516{
517 Eio_Dir_Copy *move = data; 517 Eio_Dir_Copy *move = data;
518 const char *file = NULL; 518 const char *file = NULL;
@@ -622,7 +622,7 @@ _eio_dir_move_heavy(Ecore_Thread *thread, void *data)
622} 622}
623 623
624static void 624static void
625_eio_dir_rmrf_heavy(Ecore_Thread *thread, void *data) 625_eio_dir_rmrf_heavy(void *data, Ecore_Thread *thread)
626{ 626{
627 Eio_Dir_Copy *rmrf = data; 627 Eio_Dir_Copy *rmrf = data;
628 const char *file = NULL; 628 const char *file = NULL;
diff --git a/legacy/eio/src/lib/eio_file.c b/legacy/eio/src/lib/eio_file.c
index d00d536ed0..d1f02ba626 100644
--- a/legacy/eio/src/lib/eio_file.c
+++ b/legacy/eio/src/lib/eio_file.c
@@ -114,7 +114,7 @@
114 */ 114 */
115 115
116static void 116static void
117_eio_file_heavy(Ecore_Thread *thread, void *data) 117_eio_file_heavy(void *data, Ecore_Thread *thread)
118{ 118{
119 Eio_File_Char_Ls *async = data; 119 Eio_File_Char_Ls *async = data;
120 Eina_Iterator *ls; 120 Eina_Iterator *ls;
@@ -147,7 +147,7 @@ _eio_file_heavy(Ecore_Thread *thread, void *data)
147} 147}
148 148
149static void 149static void
150_eio_file_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *data) 150_eio_file_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
151{ 151{
152 Eio_File_Char_Ls *async = data; 152 Eio_File_Char_Ls *async = data;
153 const char *file = msg_data; 153 const char *file = msg_data;
@@ -197,7 +197,7 @@ _eio_file_eina_ls_heavy(Ecore_Thread *thread, Eio_File_Direct_Ls *async, Eina_It
197} 197}
198 198
199static void 199static void
200_eio_file_direct_heavy(Ecore_Thread *thread, void *data) 200_eio_file_direct_heavy(void *data, Ecore_Thread *thread)
201{ 201{
202 Eio_File_Direct_Ls *async = data; 202 Eio_File_Direct_Ls *async = data;
203 Eina_Iterator *ls; 203 Eina_Iterator *ls;
@@ -208,7 +208,7 @@ _eio_file_direct_heavy(Ecore_Thread *thread, void *data)
208} 208}
209 209
210static void 210static void
211_eio_file_stat_heavy(Ecore_Thread *thread, void *data) 211_eio_file_stat_heavy(void *data, Ecore_Thread *thread)
212{ 212{
213 Eio_File_Direct_Ls *async = data; 213 Eio_File_Direct_Ls *async = data;
214 Eina_Iterator *ls; 214 Eina_Iterator *ls;
@@ -219,7 +219,7 @@ _eio_file_stat_heavy(Ecore_Thread *thread, void *data)
219} 219}
220 220
221static void 221static void
222_eio_file_direct_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *data) 222_eio_file_direct_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
223{ 223{
224 Eio_File_Direct_Ls *async = data; 224 Eio_File_Direct_Ls *async = data;
225 Eina_File_Direct_Info *info = msg_data; 225 Eina_File_Direct_Info *info = msg_data;
@@ -230,7 +230,7 @@ _eio_file_direct_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *d
230} 230}
231 231
232static void 232static void
233_eio_file_end(void *data) 233_eio_file_end(void *data, Ecore_Thread *thread __UNUSED__)
234{ 234{
235 Eio_File_Ls *async = data; 235 Eio_File_Ls *async = data;
236 236
@@ -241,7 +241,7 @@ _eio_file_end(void *data)
241} 241}
242 242
243static void 243static void
244_eio_file_error(void *data) 244_eio_file_error(void *data, Ecore_Thread *thread __UNUSED__)
245{ 245{
246 Eio_File_Ls *async = data; 246 Eio_File_Ls *async = data;
247 247
@@ -356,7 +356,7 @@ _eio_file_copy_splice(Ecore_Thread *thread, Eio_File_Progress *op, int in, int o
356#endif 356#endif
357 357
358static void 358static void
359_eio_file_copy_heavy(Ecore_Thread *thread, void *data) 359_eio_file_copy_heavy(void *data, Ecore_Thread *thread)
360{ 360{
361 Eio_File_Progress *copy = data; 361 Eio_File_Progress *copy = data;
362 362
@@ -364,7 +364,7 @@ _eio_file_copy_heavy(Ecore_Thread *thread, void *data)
364} 364}
365 365
366static void 366static void
367_eio_file_copy_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *data) 367_eio_file_copy_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
368{ 368{
369 Eio_File_Progress *copy = data; 369 Eio_File_Progress *copy = data;
370 370
@@ -380,7 +380,7 @@ _eio_file_copy_free(Eio_File_Progress *copy)
380} 380}
381 381
382static void 382static void
383_eio_file_copy_end(void *data) 383_eio_file_copy_end(void *data, Ecore_Thread *thread __UNUSED__)
384{ 384{
385 Eio_File_Progress *copy = data; 385 Eio_File_Progress *copy = data;
386 386
@@ -390,7 +390,7 @@ _eio_file_copy_end(void *data)
390} 390}
391 391
392static void 392static void
393_eio_file_copy_error(void *data) 393_eio_file_copy_error(void *data, Ecore_Thread *thread __UNUSED__)
394{ 394{
395 Eio_File_Progress *copy = data; 395 Eio_File_Progress *copy = data;
396 396
@@ -463,7 +463,7 @@ _eio_file_move_copy_error(void *data, int error)
463} 463}
464 464
465static void 465static void
466_eio_file_move_heavy(Ecore_Thread *thread, void *data) 466_eio_file_move_heavy(void *data, Ecore_Thread *thread)
467{ 467{
468 Eio_File_Move *move = data; 468 Eio_File_Move *move = data;
469 469
@@ -474,7 +474,7 @@ _eio_file_move_heavy(Ecore_Thread *thread, void *data)
474} 474}
475 475
476static void 476static void
477_eio_file_move_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *data) 477_eio_file_move_notify(void *data, Ecore_Thread *thread __UNUSED__, void *msg_data)
478{ 478{
479 Eio_File_Move *move = data; 479 Eio_File_Move *move = data;
480 480
@@ -482,7 +482,7 @@ _eio_file_move_notify(Ecore_Thread *thread __UNUSED__, void *msg_data, void *dat
482} 482}
483 483
484static void 484static void
485_eio_file_move_end(void *data) 485_eio_file_move_end(void *data, Ecore_Thread *thread __UNUSED__)
486{ 486{
487 Eio_File_Move *move = data; 487 Eio_File_Move *move = data;
488 488
@@ -492,7 +492,7 @@ _eio_file_move_end(void *data)
492} 492}
493 493
494static void 494static void
495_eio_file_move_error(void *data) 495_eio_file_move_error(void *data, Ecore_Thread *thread __UNUSED__)
496{ 496{
497 Eio_File_Move *move = data; 497 Eio_File_Move *move = data;
498 498
diff --git a/legacy/eio/src/lib/eio_private.h b/legacy/eio/src/lib/eio_private.h
index 038a4a2f0c..3d0b8fac9e 100644
--- a/legacy/eio/src/lib/eio_private.h
+++ b/legacy/eio/src/lib/eio_private.h
@@ -166,19 +166,19 @@ Eina_Bool eio_file_set(Eio_File *common,
166 Eio_Done_Cb done_cb, 166 Eio_Done_Cb done_cb,
167 Eio_Error_Cb error_cb, 167 Eio_Error_Cb error_cb,
168 const void *data, 168 const void *data,
169 Ecore_Thread_Heavy_Cb job_cb, 169 Ecore_Thread_Cb job_cb,
170 Ecore_Cb end_cb, 170 Ecore_Thread_Cb end_cb,
171 Ecore_Cb cancel_cb); 171 Ecore_Thread_Cb cancel_cb);
172 172
173/* Be aware that ecore_thread_run could call cancel_cb if something goes wrong. */ 173/* Be aware that ecore_thread_run could call cancel_cb if something goes wrong. */
174Eina_Bool eio_long_file_set(Eio_File *common, 174Eina_Bool eio_long_file_set(Eio_File *common,
175 Eio_Done_Cb done_cb, 175 Eio_Done_Cb done_cb,
176 Eio_Error_Cb error_cb, 176 Eio_Error_Cb error_cb,
177 const void *data, 177 const void *data,
178 Ecore_Thread_Heavy_Cb heavy_cb, 178 Ecore_Thread_Cb heavy_cb,
179 Ecore_Thread_Notify_Cb notify_cb, 179 Ecore_Thread_Notify_Cb notify_cb,
180 Ecore_Cb end_cb, 180 Ecore_Thread_Cb end_cb,
181 Ecore_Cb cancel_cb); 181 Ecore_Thread_Cb cancel_cb);
182 182
183void eio_file_error(Eio_File *common); 183void eio_file_error(Eio_File *common);
184void eio_file_thread_error(Eio_File *common, Ecore_Thread *thread); 184void eio_file_thread_error(Eio_File *common, Ecore_Thread *thread);
diff --git a/legacy/eio/src/lib/eio_single.c b/legacy/eio/src/lib/eio_single.c
index 3404361782..a39091ece0 100644
--- a/legacy/eio/src/lib/eio_single.c
+++ b/legacy/eio/src/lib/eio_single.c
@@ -30,7 +30,7 @@
30 */ 30 */
31 31
32static void 32static void
33_eio_file_mkdir(Ecore_Thread *thread, void *data) 33_eio_file_mkdir(void *data, Ecore_Thread *thread)
34{ 34{
35 Eio_File_Mkdir *m = data; 35 Eio_File_Mkdir *m = data;
36 36
@@ -46,7 +46,7 @@ _eio_mkdir_free(Eio_File_Mkdir *m)
46} 46}
47 47
48static void 48static void
49_eio_file_mkdir_done(void *data) 49_eio_file_mkdir_done(void *data, Ecore_Thread *thread __UNUSED__)
50{ 50{
51 Eio_File_Mkdir *m = data; 51 Eio_File_Mkdir *m = data;
52 52
@@ -57,7 +57,7 @@ _eio_file_mkdir_done(void *data)
57} 57}
58 58
59static void 59static void
60_eio_file_mkdir_error(void *data) 60_eio_file_mkdir_error(void *data, Ecore_Thread *thread __UNUSED__)
61{ 61{
62 Eio_File_Mkdir *m = data; 62 Eio_File_Mkdir *m = data;
63 63
@@ -66,7 +66,7 @@ _eio_file_mkdir_error(void *data)
66} 66}
67 67
68static void 68static void
69_eio_file_unlink(Ecore_Thread *thread, void *data) 69_eio_file_unlink(void *data, Ecore_Thread *thread)
70{ 70{
71 Eio_File_Unlink *l = data; 71 Eio_File_Unlink *l = data;
72 72
@@ -82,7 +82,7 @@ _eio_unlink_free(Eio_File_Unlink *l)
82} 82}
83 83
84static void 84static void
85_eio_file_unlink_done(void *data) 85_eio_file_unlink_done(void *data, Ecore_Thread *thread __UNUSED__)
86{ 86{
87 Eio_File_Unlink *l = data; 87 Eio_File_Unlink *l = data;
88 88
@@ -93,7 +93,7 @@ _eio_file_unlink_done(void *data)
93} 93}
94 94
95static void 95static void
96_eio_file_unlink_error(void *data) 96_eio_file_unlink_error(void *data, Ecore_Thread *thread __UNUSED__)
97{ 97{
98 Eio_File_Unlink *l = data; 98 Eio_File_Unlink *l = data;
99 99
@@ -102,7 +102,7 @@ _eio_file_unlink_error(void *data)
102} 102}
103 103
104static void 104static void
105_eio_file_stat(Ecore_Thread *thread, void *data) 105_eio_file_stat(void *data, Ecore_Thread *thread)
106{ 106{
107 Eio_File_Stat *s = data; 107 Eio_File_Stat *s = data;
108 108
@@ -118,7 +118,7 @@ _eio_stat_free(Eio_File_Stat *s)
118} 118}
119 119
120static void 120static void
121_eio_file_stat_done(void *data) 121_eio_file_stat_done(void *data, Ecore_Thread *thread __UNUSED__)
122{ 122{
123 Eio_File_Stat *s = data; 123 Eio_File_Stat *s = data;
124 124
@@ -129,7 +129,7 @@ _eio_file_stat_done(void *data)
129} 129}
130 130
131static void 131static void
132_eio_file_stat_error(void *data) 132_eio_file_stat_error(void *data, Ecore_Thread *thread __UNUSED__)
133{ 133{
134 Eio_File_Stat *s = data; 134 Eio_File_Stat *s = data;
135 135
@@ -138,7 +138,7 @@ _eio_file_stat_error(void *data)
138} 138}
139 139
140static void 140static void
141_eio_file_chmod(Ecore_Thread *thread, void *data) 141_eio_file_chmod(void *data, Ecore_Thread *thread)
142{ 142{
143 Eio_File_Chmod *ch = data; 143 Eio_File_Chmod *ch = data;
144 144
@@ -147,7 +147,7 @@ _eio_file_chmod(Ecore_Thread *thread, void *data)
147} 147}
148 148
149static void 149static void
150_eio_file_chown(Ecore_Thread *thread, void *data) 150_eio_file_chown(void *data, Ecore_Thread *thread)
151{ 151{
152 Eio_File_Chown *own = data; 152 Eio_File_Chown *own = data;
153 char *tmp; 153 char *tmp;
@@ -213,7 +213,7 @@ _eio_chown_free(Eio_File_Chown *ch)
213} 213}
214 214
215static void 215static void
216_eio_file_chown_done(void *data) 216_eio_file_chown_done(void *data, Ecore_Thread *thread __UNUSED__)
217{ 217{
218 Eio_File_Chown *ch = data; 218 Eio_File_Chown *ch = data;
219 219
@@ -224,7 +224,7 @@ _eio_file_chown_done(void *data)
224} 224}
225 225
226static void 226static void
227_eio_file_chown_error(void *data) 227_eio_file_chown_error(void *data, Ecore_Thread *thread __UNUSED__)
228{ 228{
229 Eio_File_Chown *ch = data; 229 Eio_File_Chown *ch = data;
230 230
@@ -263,10 +263,10 @@ eio_long_file_set(Eio_File *common,
263 Eio_Done_Cb done_cb, 263 Eio_Done_Cb done_cb,
264 Eio_Error_Cb error_cb, 264 Eio_Error_Cb error_cb,
265 const void *data, 265 const void *data,
266 Ecore_Thread_Heavy_Cb heavy_cb, 266 Ecore_Thread_Cb heavy_cb,
267 Ecore_Thread_Notify_Cb notify_cb, 267 Ecore_Thread_Notify_Cb notify_cb,
268 Ecore_Cb end_cb, 268 Ecore_Thread_Cb end_cb,
269 Ecore_Cb cancel_cb) 269 Ecore_Thread_Cb cancel_cb)
270{ 270{
271 Ecore_Thread *thread; 271 Ecore_Thread *thread;
272 272
@@ -276,7 +276,7 @@ eio_long_file_set(Eio_File *common,
276 common->error = 0; 276 common->error = 0;
277 common->thread = NULL; 277 common->thread = NULL;
278 278
279 /* Be aware that ecore_thread_run could call cancel_cb if something goes wrong. 279 /* Be aware that ecore_thread_feedback_run could call cancel_cb if something goes wrong.
280 This means that common would be destroyed if thread == NULL. 280 This means that common would be destroyed if thread == NULL.
281 */ 281 */
282 thread = ecore_thread_feedback_run(heavy_cb, 282 thread = ecore_thread_feedback_run(heavy_cb,
@@ -294,9 +294,9 @@ eio_file_set(Eio_File *common,
294 Eio_Done_Cb done_cb, 294 Eio_Done_Cb done_cb,
295 Eio_Error_Cb error_cb, 295 Eio_Error_Cb error_cb,
296 const void *data, 296 const void *data,
297 Ecore_Thread_Heavy_Cb job_cb, 297 Ecore_Thread_Cb job_cb,
298 Ecore_Cb end_cb, 298 Ecore_Thread_Cb end_cb,
299 Ecore_Cb cancel_cb) 299 Ecore_Thread_Cb cancel_cb)
300{ 300{
301 Ecore_Thread *thread; 301 Ecore_Thread *thread;
302 302