summaryrefslogtreecommitdiff
path: root/src/lib/eio
diff options
context:
space:
mode:
authorSebastian Dransfeld <sebastian.dransfeld@sintef.no>2013-06-20 13:28:18 +0200
committerSebastian Dransfeld <sebastian.dransfeld@sintef.no>2013-06-20 13:28:18 +0200
commit336f6ec32814a119a4b7f7ea8063c1d56da5e387 (patch)
tree7011bbc69cc3e8671c139fd0a226220517dc2fcf /src/lib/eio
parentb1c97a0da41e9bc998b3d9cf5c724c297582068f (diff)
efl: formatting
Diffstat (limited to 'src/lib/eio')
-rw-r--r--src/lib/eio/eio_dir.c10
-rw-r--r--src/lib/eio/eio_file.c8
-rw-r--r--src/lib/eio/eio_main.c6
-rw-r--r--src/lib/eio/eio_monitor.c8
-rw-r--r--src/lib/eio/eio_monitor_inotify.c8
-rw-r--r--src/lib/eio/eio_monitor_poll.c12
-rw-r--r--src/lib/eio/eio_monitor_win32.c2
-rw-r--r--src/lib/eio/eio_single.c4
-rw-r--r--src/lib/eio/eio_xattr.c2
9 files changed, 30 insertions, 30 deletions
diff --git a/src/lib/eio/eio_dir.c b/src/lib/eio/eio_dir.c
index 71cc3a0540..81bc1348ca 100644
--- a/src/lib/eio/eio_dir.c
+++ b/src/lib/eio/eio_dir.c
@@ -372,7 +372,7 @@ _eio_dir_copy_heavy(void *data, Ecore_Thread *thread)
372 372
373 /* list all the content that should be copied */ 373 /* list all the content that should be copied */
374 if (!_eio_dir_recursiv_ls(thread, copy, copy->progress.source)) 374 if (!_eio_dir_recursiv_ls(thread, copy, copy->progress.source))
375 return ; 375 return;
376 376
377 /* init all structure needed to copy the file */ 377 /* init all structure needed to copy the file */
378 if (!_eio_dir_init(thread, &step, &count, &length_source, &length_dest, copy, &file_copy)) 378 if (!_eio_dir_init(thread, &step, &count, &length_source, &length_dest, copy, &file_copy))
@@ -437,7 +437,7 @@ _eio_dir_copy_heavy(void *data, Ecore_Thread *thread)
437 if (!ecore_thread_check(thread)) 437 if (!ecore_thread_check(thread))
438 eio_progress_send(thread, &copy->progress, count, count); 438 eio_progress_send(thread, &copy->progress, count, count);
439 439
440 return ; 440 return;
441} 441}
442 442
443static void 443static void
@@ -497,12 +497,12 @@ _eio_dir_move_heavy(void *data, Ecore_Thread *thread)
497 { 497 {
498 /* we are really lucky */ 498 /* we are really lucky */
499 eio_progress_send(thread, &move->progress, 1, 1); 499 eio_progress_send(thread, &move->progress, 1, 1);
500 return ; 500 return;
501 } 501 }
502 502
503 /* list all the content that should be moved */ 503 /* list all the content that should be moved */
504 if (!_eio_dir_recursiv_ls(thread, move, move->progress.source)) 504 if (!_eio_dir_recursiv_ls(thread, move, move->progress.source))
505 return ; 505 return;
506 506
507 /* init all structure needed to move the file */ 507 /* init all structure needed to move the file */
508 if (!_eio_dir_init(thread, &step, &count, &length_source, &length_dest, move, &file_move)) 508 if (!_eio_dir_init(thread, &step, &count, &length_source, &length_dest, move, &file_move))
@@ -599,7 +599,7 @@ _eio_dir_rmrf_heavy(void *data, Ecore_Thread *thread)
599 599
600 /* list all the content that should be moved */ 600 /* list all the content that should be moved */
601 if (!_eio_dir_recursiv_ls(thread, rmrf, rmrf->progress.source)) 601 if (!_eio_dir_recursiv_ls(thread, rmrf, rmrf->progress.source))
602 return ; 602 return;
603 603
604 /* init counter */ 604 /* init counter */
605 step = 0; 605 step = 0;
diff --git a/src/lib/eio/eio_file.c b/src/lib/eio/eio_file.c
index 62694a5687..c6c79a0da2 100644
--- a/src/lib/eio/eio_file.c
+++ b/src/lib/eio/eio_file.c
@@ -43,7 +43,7 @@ _eio_file_heavy(void *data, Ecore_Thread *thread)
43 if (!ls) 43 if (!ls)
44 { 44 {
45 eio_file_thread_error(&async->ls.common, thread); 45 eio_file_thread_error(&async->ls.common, thread);
46 return ; 46 return;
47 } 47 }
48 48
49 eio_file_container_set(&async->ls.common, eina_iterator_container_get(ls)); 49 eio_file_container_set(&async->ls.common, eina_iterator_container_get(ls));
@@ -139,7 +139,7 @@ _eio_file_eina_ls_heavy(Ecore_Thread *thread, Eio_File_Direct_Ls *async, Eina_It
139 if (!ls) 139 if (!ls)
140 { 140 {
141 eio_file_thread_error(&async->ls.common, thread); 141 eio_file_thread_error(&async->ls.common, thread);
142 return ; 142 return;
143 } 143 }
144 144
145 eio_file_container_set(&async->ls.common, eina_iterator_container_get(ls)); 145 eio_file_container_set(&async->ls.common, eina_iterator_container_get(ls));
@@ -388,7 +388,7 @@ _eio_file_move_error(void *data, Ecore_Thread *thread EINA_UNUSED)
388 if (move->copy) 388 if (move->copy)
389 { 389 {
390 eio_file_cancel(move->copy); 390 eio_file_cancel(move->copy);
391 return ; 391 return;
392 } 392 }
393 393
394 if (move->progress.common.error == EXDEV) 394 if (move->progress.common.error == EXDEV)
@@ -406,7 +406,7 @@ _eio_file_move_error(void *data, Ecore_Thread *thread EINA_UNUSED)
406 move->copy = eio_cp; 406 move->copy = eio_cp;
407 407
408 move->progress.common.thread = ((Eio_File_Progress*)move->copy)->common.thread; 408 move->progress.common.thread = ((Eio_File_Progress*)move->copy)->common.thread;
409 return ; 409 return;
410 } 410 }
411 } 411 }
412 412
diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c
index 6e9d843c5d..a1f9f182d2 100644
--- a/src/lib/eio/eio_main.c
+++ b/src/lib/eio/eio_main.c
@@ -115,10 +115,10 @@ eio_progress_send(Ecore_Thread *thread, Eio_File_Progress *op, long long current
115 Eio_Progress *progress; 115 Eio_Progress *progress;
116 116
117 if (op->progress_cb == NULL) 117 if (op->progress_cb == NULL)
118 return ; 118 return;
119 119
120 progress = eio_progress_malloc(); 120 progress = eio_progress_malloc();
121 if (!progress) return ; 121 if (!progress) return;
122 122
123 progress->op = op->op; 123 progress->op = op->op;
124 progress->current = current; 124 progress->current = current;
@@ -173,7 +173,7 @@ eio_associate_free(void *data)
173{ 173{
174 Eio_File_Associate *tmp; 174 Eio_File_Associate *tmp;
175 175
176 if (!data) return ; 176 if (!data) return;
177 177
178 tmp = data; 178 tmp = data;
179 if (tmp->free_cb) 179 if (tmp->free_cb)
diff --git a/src/lib/eio/eio_monitor.c b/src/lib/eio/eio_monitor.c
index 3a6d9c91e2..247fe7c522 100644
--- a/src/lib/eio/eio_monitor.c
+++ b/src/lib/eio/eio_monitor.c
@@ -92,7 +92,7 @@ _eio_monitor_error(Eio_Monitor *monitor, int error)
92 Eio_Monitor_Error *ev; 92 Eio_Monitor_Error *ev;
93 93
94 ev = calloc(1, sizeof (Eio_Monitor_Error)); 94 ev = calloc(1, sizeof (Eio_Monitor_Error));
95 if (!ev) return ; 95 if (!ev) return;
96 96
97 ev->monitor = monitor; 97 ev->monitor = monitor;
98 EINA_REFCOUNT_REF(ev->monitor); 98 EINA_REFCOUNT_REF(ev->monitor);
@@ -115,7 +115,7 @@ _eio_monitor_error_cb(void *data, Eio_File *handler EINA_UNUSED, int error)
115 EINA_REFCOUNT_UNREF(monitor) 115 EINA_REFCOUNT_UNREF(monitor)
116 _eio_monitor_free(monitor); 116 _eio_monitor_free(monitor);
117 117
118 return ; 118 return;
119} 119}
120 120
121/** 121/**
@@ -186,7 +186,7 @@ _eio_monitor_send(Eio_Monitor *monitor, const char *filename, int event_code)
186 Eio_Monitor_Event *ev; 186 Eio_Monitor_Event *ev;
187 187
188 ev = calloc(1, sizeof (Eio_Monitor_Event)); 188 ev = calloc(1, sizeof (Eio_Monitor_Event));
189 if (!ev) return ; 189 if (!ev) return;
190 190
191 ev->monitor = monitor; 191 ev->monitor = monitor;
192 EINA_REFCOUNT_REF(ev->monitor); 192 EINA_REFCOUNT_REF(ev->monitor);
@@ -221,7 +221,7 @@ _eio_monitor_rename(Eio_Monitor *monitor, const char *newpath)
221 if (tmp == monitor->path) 221 if (tmp == monitor->path)
222 { 222 {
223 _eio_monitor_error(monitor, -1); 223 _eio_monitor_error(monitor, -1);
224 return ; 224 return;
225 } 225 }
226 226
227 EINA_REFCOUNT_REF(monitor); /* as we spawn a thread for this monitor, we need to refcount specifically for it */ 227 EINA_REFCOUNT_REF(monitor); /* as we spawn a thread for this monitor, we need to refcount specifically for it */
diff --git a/src/lib/eio/eio_monitor_inotify.c b/src/lib/eio/eio_monitor_inotify.c
index 012cd59c4a..0ec2f8f901 100644
--- a/src/lib/eio/eio_monitor_inotify.c
+++ b/src/lib/eio/eio_monitor_inotify.c
@@ -170,7 +170,7 @@ void eio_monitor_backend_init(void)
170 170
171 fd = inotify_init(); 171 fd = inotify_init();
172 if (fd < 0) 172 if (fd < 0)
173 return ; 173 return;
174 174
175#ifdef HAVE_FCNTL 175#ifdef HAVE_FCNTL
176 flags = fcntl(fd, F_GETFD); 176 flags = fcntl(fd, F_GETFD);
@@ -182,7 +182,7 @@ void eio_monitor_backend_init(void)
182 if (!_inotify_fdh) 182 if (!_inotify_fdh)
183 { 183 {
184 close(fd); 184 close(fd);
185 return ; 185 return;
186 } 186 }
187 187
188 _inotify_monitors = eina_hash_int32_new(_eio_inotify_del); 188 _inotify_monitors = eina_hash_int32_new(_eio_inotify_del);
@@ -192,7 +192,7 @@ void eio_monitor_backend_shutdown(void)
192{ 192{
193 int fd; 193 int fd;
194 194
195 if (!_inotify_fdh) return ; 195 if (!_inotify_fdh) return;
196 196
197 eina_hash_free(_inotify_monitors); 197 eina_hash_free(_inotify_monitors);
198 198
@@ -250,7 +250,7 @@ void eio_monitor_backend_del(Eio_Monitor *monitor)
250 if (!_inotify_fdh) 250 if (!_inotify_fdh)
251 eio_monitor_fallback_del(monitor); 251 eio_monitor_fallback_del(monitor);
252 252
253 if (!monitor->backend) return ; 253 if (!monitor->backend) return;
254 254
255 eina_hash_del(_inotify_monitors, &monitor->backend->hwnd, monitor->backend); 255 eina_hash_del(_inotify_monitors, &monitor->backend->hwnd, monitor->backend);
256 monitor->backend = NULL; 256 monitor->backend = NULL;
diff --git a/src/lib/eio/eio_monitor_poll.c b/src/lib/eio/eio_monitor_poll.c
index 2b9eb7cd8e..c93ac4d579 100644
--- a/src/lib/eio/eio_monitor_poll.c
+++ b/src/lib/eio/eio_monitor_poll.c
@@ -72,7 +72,7 @@ _eio_monitor_fallback_heavy_cb(void *data, Ecore_Thread *thread)
72 est = alloca(sizeof (Eina_Stat)); 72 est = alloca(sizeof (Eina_Stat));
73 73
74 if (!backend->parent) 74 if (!backend->parent)
75 return ; 75 return;
76 76
77 if (_eio_stat(backend->parent->path, &st)) 77 if (_eio_stat(backend->parent->path, &st))
78 { 78 {
@@ -83,7 +83,7 @@ _eio_monitor_fallback_heavy_cb(void *data, Ecore_Thread *thread)
83 ecore_thread_main_loop_end(); 83 ecore_thread_main_loop_end();
84 backend->destroyed = EINA_TRUE; 84 backend->destroyed = EINA_TRUE;
85 } 85 }
86 return ; 86 return;
87 } 87 }
88 88
89 backend->destroyed = EINA_FALSE; 89 backend->destroyed = EINA_FALSE;
@@ -229,7 +229,7 @@ _eio_monitor_fallback_cancel_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
229 if (backend->delete_me) 229 if (backend->delete_me)
230 { 230 {
231 free(backend); 231 free(backend);
232 return ; 232 return;
233 } 233 }
234 backend->timer = ecore_timer_add(60.0, _eio_monitor_fallback_timer_cb, backend); 234 backend->timer = ecore_timer_add(60.0, _eio_monitor_fallback_timer_cb, backend);
235} 235}
@@ -308,7 +308,7 @@ eio_monitor_fallback_add(Eio_Monitor *monitor)
308 monitor->backend = NULL; 308 monitor->backend = NULL;
309 309
310 backend = calloc(1, sizeof (Eio_Monitor_Backend)); 310 backend = calloc(1, sizeof (Eio_Monitor_Backend));
311 if (!backend) return ; 311 if (!backend) return;
312 312
313 backend->children = eina_hash_string_superfast_new(free); 313 backend->children = eina_hash_string_superfast_new(free);
314 backend->parent = monitor; 314 backend->parent = monitor;
@@ -327,7 +327,7 @@ eio_monitor_fallback_del(Eio_Monitor *monitor)
327 backend = monitor->backend; 327 backend = monitor->backend;
328 monitor->backend = NULL; 328 monitor->backend = NULL;
329 329
330 if (!backend) return ; 330 if (!backend) return;
331 331
332 backend->parent = NULL; 332 backend->parent = NULL;
333 if (backend->timer) ecore_timer_del(backend->timer); 333 if (backend->timer) ecore_timer_del(backend->timer);
@@ -338,7 +338,7 @@ eio_monitor_fallback_del(Eio_Monitor *monitor)
338 { 338 {
339 backend->delete_me = EINA_TRUE; 339 backend->delete_me = EINA_TRUE;
340 ecore_thread_cancel(backend->work); 340 ecore_thread_cancel(backend->work);
341 return ; 341 return;
342 } 342 }
343 eina_hash_free(backend->children); 343 eina_hash_free(backend->children);
344 free(backend); 344 free(backend);
diff --git a/src/lib/eio/eio_monitor_win32.c b/src/lib/eio/eio_monitor_win32.c
index 50404e230e..8a4d7a2fb5 100644
--- a/src/lib/eio/eio_monitor_win32.c
+++ b/src/lib/eio/eio_monitor_win32.c
@@ -404,7 +404,7 @@ void eio_monitor_backend_del(Eio_Monitor *monitor)
404 if (!_eio_monitor_win32_native) 404 if (!_eio_monitor_win32_native)
405 { 405 {
406 eio_monitor_fallback_del(monitor); 406 eio_monitor_fallback_del(monitor);
407 return ; 407 return;
408 } 408 }
409 409
410 _eio_monitor_win32_watcher_free(monitor->backend->watcher_parent); 410 _eio_monitor_win32_watcher_free(monitor->backend->watcher_parent);
diff --git a/src/lib/eio/eio_single.c b/src/lib/eio/eio_single.c
index 50bc82909e..1694bd6784 100644
--- a/src/lib/eio/eio_single.c
+++ b/src/lib/eio/eio_single.c
@@ -256,11 +256,11 @@ _eio_file_chown(void *data, Ecore_Thread *thread)
256 if (chown(own->path, owner, group) != 0) 256 if (chown(own->path, owner, group) != 0)
257 eio_file_thread_error(&own->common, thread); 257 eio_file_thread_error(&own->common, thread);
258 258
259 return ; 259 return;
260 260
261 on_error: 261 on_error:
262 ecore_thread_cancel(thread); 262 ecore_thread_cancel(thread);
263 return ; 263 return;
264#endif 264#endif
265} 265}
266 266
diff --git a/src/lib/eio/eio_xattr.c b/src/lib/eio/eio_xattr.c
index 73e242131c..63a3995136 100644
--- a/src/lib/eio/eio_xattr.c
+++ b/src/lib/eio/eio_xattr.c
@@ -36,7 +36,7 @@ _eio_ls_xattr_heavy(void *data, Ecore_Thread *thread)
36 const char *tmp; 36 const char *tmp;
37 37
38 it = eina_xattr_ls(async->ls.directory); 38 it = eina_xattr_ls(async->ls.directory);
39 if (!it) return ; 39 if (!it) return;
40 40
41 EINA_ITERATOR_FOREACH(it, tmp) 41 EINA_ITERATOR_FOREACH(it, tmp)
42 { 42 {