summaryrefslogtreecommitdiff
path: root/src/lib
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
parentb1c97a0da41e9bc998b3d9cf5c724c297582068f (diff)
efl: formatting
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ecore_con/ecore_con_alloc.c2
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c64
-rw-r--r--src/lib/ecore_input_evas/ecore_input_evas.c8
-rw-r--r--src/lib/ecore_sdl/ecore_sdl.c8
-rw-r--r--src/lib/edje/edje_cache.c4
-rw-r--r--src/lib/edje/edje_calc.c8
-rw-r--r--src/lib/edje/edje_convert.c2
-rw-r--r--src/lib/edje/edje_edit.c6
-rw-r--r--src/lib/edje/edje_entry.c2
-rw-r--r--src/lib/edje/edje_match.c2
-rw-r--r--src/lib/edje/edje_signal.c20
-rw-r--r--src/lib/edje/edje_smart.c4
-rw-r--r--src/lib/edje/edje_text.c2
-rw-r--r--src/lib/edje/edje_util.c16
-rw-r--r--src/lib/eet/eet_data.c10
-rw-r--r--src/lib/efreet/efreet_mime.c2
-rw-r--r--src/lib/eina/eina_accessor.c4
-rw-r--r--src/lib/eina/eina_array.c2
-rw-r--r--src/lib/eina/eina_cow.c20
-rw-r--r--src/lib/eina/eina_file_common.c2
-rw-r--r--src/lib/eina/eina_inarray.c2
-rw-r--r--src/lib/eina/eina_iterator.c2
-rw-r--r--src/lib/eina/eina_log.c6
-rw-r--r--src/lib/eina/eina_object.c2
-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
-rw-r--r--src/lib/emotion/emotion_smart.c14
-rw-r--r--src/lib/emotion/emotion_webcam.c4
-rw-r--r--src/lib/ethumb/ethumb.c2
-rw-r--r--src/lib/evas/cache/evas_cache_engine_image.c4
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_map.c4
-rw-r--r--src/lib/evas/canvas/evas_object_image.c14
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c8
-rw-r--r--src/lib/evas/canvas/evas_object_text.c4
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c4
-rw-r--r--src/lib/evas/canvas/evas_render.c2
-rw-r--r--src/lib/evas/common/evas_draw_main.c2
-rw-r--r--src/lib/evas/common/evas_font_draw.c2
-rw-r--r--src/lib/evas/common/evas_font_load.c2
-rw-r--r--src/lib/evas/common/evas_image_main.c6
-rw-r--r--src/lib/evas/common/evas_map_image.c6
-rw-r--r--src/lib/evas/common/evas_pipe.c8
-rw-r--r--src/lib/evas/common/evas_rectangle_main.c2
-rw-r--r--src/lib/evas/file/evas_module.c2
52 files changed, 176 insertions, 176 deletions
diff --git a/src/lib/ecore_con/ecore_con_alloc.c b/src/lib/ecore_con/ecore_con_alloc.c
index 324d47d100..1747ea3b20 100644
--- a/src/lib/ecore_con/ecore_con_alloc.c
+++ b/src/lib/ecore_con/ecore_con_alloc.c
@@ -81,7 +81,7 @@ ecore_con_mempool_init(void)
81 else 81 else
82 { 82 {
83 ERR("Impossible to allocate mempool '%s' !", choice); 83 ERR("Impossible to allocate mempool '%s' !", choice);
84 return ; 84 return;
85 } 85 }
86 } 86 }
87 } 87 }
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index 9ec6972dac..d3b62204b6 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -286,11 +286,11 @@ _ecore_con_eet_data(Ecore_Con_Reply *n, void *data, unsigned int size)
286 if (n->buffer_current + size > n->buffer_length) 286 if (n->buffer_current + size > n->buffer_length)
287 { 287 {
288 _ecore_con_eet_reply_cleanup(n); 288 _ecore_con_eet_reply_cleanup(n);
289 return ; 289 return;
290 } 290 }
291 291
292 _ecore_con_eet_raw_data_push(n, data, size); 292 _ecore_con_eet_raw_data_push(n, data, size);
293 return ; 293 return;
294 } 294 }
295 else if (eet_connection_empty(n->econn) && size > (int) (4 * sizeof (unsigned int) + 2)) 295 else if (eet_connection_empty(n->econn) && size > (int) (4 * sizeof (unsigned int) + 2))
296 { 296 {
@@ -329,7 +329,7 @@ _ecore_con_eet_data(Ecore_Con_Reply *n, void *data, unsigned int size)
329 if (n->buffer) 329 if (n->buffer)
330 { 330 {
331 _ecore_con_eet_raw_data_push(n, buffer, size); 331 _ecore_con_eet_raw_data_push(n, buffer, size);
332 return ; 332 return;
333 } 333 }
334 _ecore_con_eet_reply_cleanup(n); 334 _ecore_con_eet_reply_cleanup(n);
335 335
@@ -487,7 +487,7 @@ ecore_con_eet_client_new(Ecore_Con_Server *server)
487EAPI void 487EAPI void
488ecore_con_eet_server_free(Ecore_Con_Eet *r) 488ecore_con_eet_server_free(Ecore_Con_Eet *r)
489{ 489{
490 if (!r) return ; 490 if (!r) return;
491 491
492 eet_data_descriptor_free(r->edd); 492 eet_data_descriptor_free(r->edd);
493 eet_data_descriptor_free(r->matching); 493 eet_data_descriptor_free(r->matching);
@@ -535,7 +535,7 @@ ecore_con_eet_server_free(Ecore_Con_Eet *r)
535EAPI void 535EAPI void
536ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd) 536ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd)
537{ 537{
538 if (!ece) return ; 538 if (!ece) return;
539 539
540 EET_DATA_DESCRIPTOR_ADD_MAPPING(ece->matching, name, edd); 540 EET_DATA_DESCRIPTOR_ADD_MAPPING(ece->matching, name, edd);
541} 541}
@@ -545,10 +545,10 @@ ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_
545{ 545{
546 Ecore_Con_Eet_Data *eced; 546 Ecore_Con_Eet_Data *eced;
547 547
548 if (!ece) return ; 548 if (!ece) return;
549 549
550 eced = calloc(1, sizeof (Ecore_Con_Eet_Data)); 550 eced = calloc(1, sizeof (Ecore_Con_Eet_Data));
551 if (!eced) return ; 551 if (!eced) return;
552 552
553 eced->func = func; 553 eced->func = func;
554 eced->data = data; 554 eced->data = data;
@@ -560,7 +560,7 @@ ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_
560EAPI void 560EAPI void
561ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name) 561ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name)
562{ 562{
563 if (!ece) return ; 563 if (!ece) return;
564 eina_hash_del(ece->data_callbacks, name, NULL); 564 eina_hash_del(ece->data_callbacks, name, NULL);
565} 565}
566 566
@@ -569,10 +569,10 @@ ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_
569{ 569{
570 Ecore_Con_Eet_Raw_Data *eced; 570 Ecore_Con_Eet_Raw_Data *eced;
571 571
572 if (!ece) return ; 572 if (!ece) return;
573 573
574 eced = calloc(1, sizeof (Ecore_Con_Eet_Raw_Data)); 574 eced = calloc(1, sizeof (Ecore_Con_Eet_Raw_Data));
575 if (!eced) return ; 575 if (!eced) return;
576 576
577 eced->func = func; 577 eced->func = func;
578 eced->data = data; 578 eced->data = data;
@@ -584,7 +584,7 @@ ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_
584EAPI void 584EAPI void
585ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name) 585ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name)
586{ 586{
587 if (!ece) return ; 587 if (!ece) return;
588 588
589 if (ece->client && ece->u.client.r->buffer_handler && !strcmp(ece->u.client.r->buffer_handler->name, name)) 589 if (ece->client && ece->u.client.r->buffer_handler && !strcmp(ece->u.client.r->buffer_handler->name, name))
590 { 590 {
@@ -600,10 +600,10 @@ ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie
600{ 600{
601 Ecore_Con_Eet_Client *c; 601 Ecore_Con_Eet_Client *c;
602 602
603 if (!ece || !func) return ; 603 if (!ece || !func) return;
604 604
605 c = calloc(1, sizeof (Ecore_Con_Eet_Client)); 605 c = calloc(1, sizeof (Ecore_Con_Eet_Client));
606 if (!c) return ; 606 if (!c) return;
607 607
608 c->func = func; 608 c->func = func;
609 c->data = data; 609 c->data = data;
@@ -617,14 +617,14 @@ ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Clie
617 Ecore_Con_Eet_Client *c; 617 Ecore_Con_Eet_Client *c;
618 Eina_List *l; 618 Eina_List *l;
619 619
620 if (!ece || !func) return ; 620 if (!ece || !func) return;
621 621
622 EINA_LIST_FOREACH(ece->u.server.client_connect_callbacks, l, c) 622 EINA_LIST_FOREACH(ece->u.server.client_connect_callbacks, l, c)
623 if (c->func == func && c->data == data) 623 if (c->func == func && c->data == data)
624 { 624 {
625 ece->u.server.client_connect_callbacks = eina_list_remove_list(ece->u.server.client_connect_callbacks, l); 625 ece->u.server.client_connect_callbacks = eina_list_remove_list(ece->u.server.client_connect_callbacks, l);
626 free(c); 626 free(c);
627 return ; 627 return;
628 } 628 }
629} 629}
630 630
@@ -633,10 +633,10 @@ ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
633{ 633{
634 Ecore_Con_Eet_Client *c; 634 Ecore_Con_Eet_Client *c;
635 635
636 if (!ece || !func) return ; 636 if (!ece || !func) return;
637 637
638 c = calloc(1, sizeof (Ecore_Con_Eet_Client)); 638 c = calloc(1, sizeof (Ecore_Con_Eet_Client));
639 if (!c) return ; 639 if (!c) return;
640 640
641 c->func = func; 641 c->func = func;
642 c->data = data; 642 c->data = data;
@@ -650,7 +650,7 @@ ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
650 Ecore_Con_Eet_Client *c; 650 Ecore_Con_Eet_Client *c;
651 Eina_List *l; 651 Eina_List *l;
652 652
653 if (!ece || !func) return ; 653 if (!ece || !func) return;
654 654
655 EINA_LIST_FOREACH(ece->u.server.client_disconnect_callbacks, l, c) 655 EINA_LIST_FOREACH(ece->u.server.client_disconnect_callbacks, l, c)
656 if (c->func == func && c->data == data) 656 if (c->func == func && c->data == data)
@@ -658,7 +658,7 @@ ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_C
658 ece->u.server.client_disconnect_callbacks = eina_list_remove_list(ece->u.server.client_disconnect_callbacks, 658 ece->u.server.client_disconnect_callbacks = eina_list_remove_list(ece->u.server.client_disconnect_callbacks,
659 l); 659 l);
660 free(c); 660 free(c);
661 return ; 661 return;
662 } 662 }
663} 663}
664 664
@@ -667,10 +667,10 @@ ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv
667{ 667{
668 Ecore_Con_Eet_Server *s; 668 Ecore_Con_Eet_Server *s;
669 669
670 if (!ece || !func) return ; 670 if (!ece || !func) return;
671 671
672 s = calloc(1, sizeof (Ecore_Con_Eet_Server)); 672 s = calloc(1, sizeof (Ecore_Con_Eet_Server));
673 if (!s) return ; 673 if (!s) return;
674 674
675 s->func = func; 675 s->func = func;
676 s->data = data; 676 s->data = data;
@@ -684,14 +684,14 @@ ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Serv
684 Ecore_Con_Eet_Server *s; 684 Ecore_Con_Eet_Server *s;
685 Eina_List *l; 685 Eina_List *l;
686 686
687 if (!ece || !func) return ; 687 if (!ece || !func) return;
688 688
689 EINA_LIST_FOREACH(ece->u.client.server_connect_callbacks, l, s) 689 EINA_LIST_FOREACH(ece->u.client.server_connect_callbacks, l, s)
690 if (s->func == func && s->data == data) 690 if (s->func == func && s->data == data)
691 { 691 {
692 ece->u.client.server_connect_callbacks = eina_list_remove_list(ece->u.client.server_connect_callbacks, l); 692 ece->u.client.server_connect_callbacks = eina_list_remove_list(ece->u.client.server_connect_callbacks, l);
693 free(s); 693 free(s);
694 return ; 694 return;
695 } 695 }
696} 696}
697 697
@@ -700,10 +700,10 @@ ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
700{ 700{
701 Ecore_Con_Eet_Server *s; 701 Ecore_Con_Eet_Server *s;
702 702
703 if (!ece || !func) return ; 703 if (!ece || !func) return;
704 704
705 s = calloc(1, sizeof (Ecore_Con_Eet_Server)); 705 s = calloc(1, sizeof (Ecore_Con_Eet_Server));
706 if (!s) return ; 706 if (!s) return;
707 707
708 s->func = func; 708 s->func = func;
709 s->data = data; 709 s->data = data;
@@ -717,14 +717,14 @@ ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_S
717 Ecore_Con_Eet_Server *s; 717 Ecore_Con_Eet_Server *s;
718 Eina_List *l; 718 Eina_List *l;
719 719
720 if (!ece || !func) return ; 720 if (!ece || !func) return;
721 721
722 EINA_LIST_FOREACH(ece->u.client.server_disconnect_callbacks, l, s) 722 EINA_LIST_FOREACH(ece->u.client.server_disconnect_callbacks, l, s)
723 if (s->func == func && s->data == data) 723 if (s->func == func && s->data == data)
724 { 724 {
725 ece->u.client.server_disconnect_callbacks = eina_list_remove_list(ece->u.client.server_disconnect_callbacks, l); 725 ece->u.client.server_disconnect_callbacks = eina_list_remove_list(ece->u.client.server_disconnect_callbacks, l);
726 free(s); 726 free(s);
727 return ; 727 return;
728 } 728 }
729} 729}
730 730
@@ -755,7 +755,7 @@ ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value)
755{ 755{
756 Ecore_Con_Eet_Protocol protocol; 756 Ecore_Con_Eet_Protocol protocol;
757 757
758 if (!reply) return ; 758 if (!reply) return;
759 759
760 protocol.type = name; 760 protocol.type = name;
761 protocol.data = value; 761 protocol.data = value;
@@ -772,12 +772,12 @@ ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const
772 unsigned int size; 772 unsigned int size;
773 char *tmp; 773 char *tmp;
774 774
775 if (!reply) return ; 775 if (!reply) return;
776 if (!protocol_name) return ; 776 if (!protocol_name) return;
777 if (!section) return ; 777 if (!section) return;
778 778
779 protocol_length = strlen(protocol_name) + 1; 779 protocol_length = strlen(protocol_name) + 1;
780 if (protocol_length == 1) return ; 780 if (protocol_length == 1) return;
781 section_length = strlen(section) + 1; 781 section_length = strlen(section) + 1;
782 782
783 protocol[0] = htonl(ECORE_CON_EET_RAW_MAGIC); 783 protocol[0] = htonl(ECORE_CON_EET_RAW_MAGIC);
diff --git a/src/lib/ecore_input_evas/ecore_input_evas.c b/src/lib/ecore_input_evas/ecore_input_evas.c
index 57ed890957..8669226983 100644
--- a/src/lib/ecore_input_evas/ecore_input_evas.c
+++ b/src/lib/ecore_input_evas/ecore_input_evas.c
@@ -114,10 +114,10 @@ _ecore_event_evas_push_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Pre
114{ 114{
115 Ecore_Event_Last *eel; 115 Ecore_Event_Last *eel;
116 116
117 if (!_last_events_enable) return ; 117 if (!_last_events_enable) return;
118 118
119 eel = _ecore_event_evas_lookup(e->multi.device, e->buttons, EINA_TRUE); 119 eel = _ecore_event_evas_lookup(e->multi.device, e->buttons, EINA_TRUE);
120 if (!eel) return ; 120 if (!eel) return;
121 121
122 switch (eel->state) 122 switch (eel->state)
123 { 123 {
@@ -158,7 +158,7 @@ _ecore_event_evas_push_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Pre
158 { 158 {
159 /* Save the Ecore_Event somehow */ 159 /* Save the Ecore_Event somehow */
160 if (!eel->ev) eel->ev = malloc(sizeof (Ecore_Event_Mouse_Button)); 160 if (!eel->ev) eel->ev = malloc(sizeof (Ecore_Event_Mouse_Button));
161 if (!eel->ev) return ; 161 if (!eel->ev) return;
162 memcpy(eel->ev, e, sizeof (Ecore_Event_Mouse_Button)); 162 memcpy(eel->ev, e, sizeof (Ecore_Event_Mouse_Button));
163 eel->timer = ecore_timer_add(_last_events_timeout, _ecore_event_evas_push_fake, eel); 163 eel->timer = ecore_timer_add(_last_events_timeout, _ecore_event_evas_push_fake, eel);
164 } 164 }
@@ -176,7 +176,7 @@ _ecore_event_evas_push_mouse_move(Ecore_Event_Mouse_Move *e)
176 Ecore_Event_Last *eel; 176 Ecore_Event_Last *eel;
177 Eina_List *l; 177 Eina_List *l;
178 178
179 if (!_last_events_enable) return ; 179 if (!_last_events_enable) return;
180 180
181 EINA_LIST_FOREACH(_last_events, l, eel) 181 EINA_LIST_FOREACH(_last_events, l, eel)
182 switch (eel->state) 182 switch (eel->state)
diff --git a/src/lib/ecore_sdl/ecore_sdl.c b/src/lib/ecore_sdl/ecore_sdl.c
index ec1f29cd85..ab85c75370 100644
--- a/src/lib/ecore_sdl/ecore_sdl.c
+++ b/src/lib/ecore_sdl/ecore_sdl.c
@@ -166,7 +166,7 @@ ecore_sdl_feed_events(void)
166 Ecore_Event_Mouse_Move *ev; 166 Ecore_Event_Mouse_Move *ev;
167 167
168 ev = malloc(sizeof(Ecore_Event_Mouse_Move)); 168 ev = malloc(sizeof(Ecore_Event_Mouse_Move));
169 if (!ev) return ; 169 if (!ev) return;
170 170
171 ev->timestamp = timestamp; 171 ev->timestamp = timestamp;
172 ev->window = 0; 172 ev->window = 0;
@@ -194,7 +194,7 @@ ecore_sdl_feed_events(void)
194 Ecore_Event_Mouse_Wheel *ev; 194 Ecore_Event_Mouse_Wheel *ev;
195 195
196 ev = malloc(sizeof(Ecore_Event_Mouse_Wheel)); 196 ev = malloc(sizeof(Ecore_Event_Mouse_Wheel));
197 if (!ev) return ; 197 if (!ev) return;
198 198
199 ev->timestamp = timestamp; 199 ev->timestamp = timestamp;
200 ev->window = 0; 200 ev->window = 0;
@@ -210,7 +210,7 @@ ecore_sdl_feed_events(void)
210 Ecore_Event_Mouse_Button *ev; 210 Ecore_Event_Mouse_Button *ev;
211 211
212 ev = malloc(sizeof(Ecore_Event_Mouse_Button)); 212 ev = malloc(sizeof(Ecore_Event_Mouse_Button));
213 if (!ev) return ; 213 if (!ev) return;
214 214
215 ev->timestamp = timestamp; 215 ev->timestamp = timestamp;
216 ev->window = 0; 216 ev->window = 0;
@@ -235,7 +235,7 @@ ecore_sdl_feed_events(void)
235 Ecore_Event_Mouse_Button *ev; 235 Ecore_Event_Mouse_Button *ev;
236 236
237 ev = malloc(sizeof(Ecore_Event_Mouse_Button)); 237 ev = malloc(sizeof(Ecore_Event_Mouse_Button));
238 if (!ev) return ; 238 if (!ev) return;
239 ev->timestamp = timestamp; 239 ev->timestamp = timestamp;
240 ev->window = 0; 240 ev->window = 0;
241 ev->event_window = 0; 241 ev->event_window = 0;
diff --git a/src/lib/edje/edje_cache.c b/src/lib/edje/edje_cache.c
index 4f6e0749e8..aa7e075c5d 100644
--- a/src/lib/edje/edje_cache.c
+++ b/src/lib/edje/edje_cache.c
@@ -102,10 +102,10 @@ _edje_programs_patterns_init(Edje_Part_Collection *edc)
102 + edc->programs.strrncmp_count 102 + edc->programs.strrncmp_count
103 + edc->programs.fnmatch_count 103 + edc->programs.fnmatch_count
104 + edc->programs.nocmp_count; 104 + edc->programs.nocmp_count;
105 if (j == 0) return ; 105 if (j == 0) return;
106 106
107 all = malloc(sizeof (Edje_Program *) * j); 107 all = malloc(sizeof (Edje_Program *) * j);
108 if (!all) return ; 108 if (!all) return;
109 j = 0; 109 j = 0;
110 110
111 /* FIXME: Build specialized data type for each case */ 111 /* FIXME: Build specialized data type for each case */
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index fab22c4c88..d0309d7da0 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -694,7 +694,7 @@ _edje_recalc_do(Edje *ed)
694 eo_do(ed->obj, evas_obj_size_hint_min_set(w, h)); 694 eo_do(ed->obj, evas_obj_size_hint_min_set(w, h));
695 } 695 }
696 696
697 if (!ed->collection) return ; 697 if (!ed->collection) return;
698 698
699 for (i = 0; i < ed->collection->limits.parts_count; i++) 699 for (i = 0; i < ed->collection->limits.parts_count; i++)
700 { 700 {
@@ -818,7 +818,7 @@ void
818_edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y) 818_edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
819{ 819{
820 /* check whether this part is dragable at all */ 820 /* check whether this part is dragable at all */
821 if (!ep->drag) return ; 821 if (!ep->drag) return;
822 822
823 /* instead of checking for equality, we really should check that 823 /* instead of checking for equality, we really should check that
824 * the difference is greater than foo, but I have no idea what 824 * the difference is greater than foo, but I have no idea what
@@ -2076,7 +2076,7 @@ _edje_part_recalc_single_map(Edje *ed,
2076 params->lighted = params->mapped ? !!light : 0; 2076 params->lighted = params->mapped ? !!light : 0;
2077 params->persp_on = params->mapped ? !!persp : 0; 2077 params->persp_on = params->mapped ? !!persp : 0;
2078 2078
2079 if (!params->mapped) return ; 2079 if (!params->mapped) return;
2080 2080
2081 EINA_COW_CALC_MAP_BEGIN(params, params_write) 2081 EINA_COW_CALC_MAP_BEGIN(params, params_write)
2082 { 2082 {
@@ -3023,7 +3023,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
3023 3023
3024#ifdef EDJE_CALC_CACHE 3024#ifdef EDJE_CALC_CACHE
3025 if (ep->state == ed->state && !state) 3025 if (ep->state == ed->state && !state)
3026 return ; 3026 return;
3027#endif 3027#endif
3028 3028
3029 if (ep->param1.description->rel1.id_x >= 0) 3029 if (ep->param1.description->rel1.id_x >= 0)
diff --git a/src/lib/edje/edje_convert.c b/src/lib/edje/edje_convert.c
index 5fa7a04291..f5ea27451c 100644
--- a/src/lib/edje/edje_convert.c
+++ b/src/lib/edje/edje_convert.c
@@ -244,7 +244,7 @@ _edje_collection_program_add(Edje_Program ***array,
244 Edje_Program **tmp; 244 Edje_Program **tmp;
245 245
246 tmp = realloc(*array, sizeof (Edje_Program*) * (*count + 1)); 246 tmp = realloc(*array, sizeof (Edje_Program*) * (*count + 1));
247 if (!tmp) return ; 247 if (!tmp) return;
248 248
249 tmp[(*count)++] = add; 249 tmp[(*count)++] = add;
250 *array = tmp; 250 *array = tmp;
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 9252a0ac8b..bef2fe2835 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -2682,7 +2682,7 @@ edje_edit_part_drag_x_set(Evas_Object *obj, const char *part, int drag)
2682 { 2682 {
2683 free(rp->drag); 2683 free(rp->drag);
2684 rp->drag = NULL; 2684 rp->drag = NULL;
2685 return ; 2685 return;
2686 } 2686 }
2687 2687
2688 if (rp->drag) return; 2688 if (rp->drag) return;
@@ -2717,7 +2717,7 @@ edje_edit_part_drag_y_set(Evas_Object *obj, const char *part, int drag)
2717 { 2717 {
2718 free(rp->drag); 2718 free(rp->drag);
2719 rp->drag = NULL; 2719 rp->drag = NULL;
2720 return ; 2720 return;
2721 } 2721 }
2722 2722
2723 if (rp->drag) return; 2723 if (rp->drag) return;
@@ -2777,7 +2777,7 @@ FUNC_PART_DRAG_INT(count, y);
2777 if (!e) \ 2777 if (!e) \
2778 { \ 2778 { \
2779 rp->part->dragable.Id##_id = -1; \ 2779 rp->part->dragable.Id##_id = -1; \
2780 return ; \ 2780 return; \
2781 } \ 2781 } \
2782 \ 2782 \
2783 e_part = _edje_real_part_get(ed, e); \ 2783 e_part = _edje_real_part_get(ed, e); \
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 96b7e0e333..eab36233cc 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -111,7 +111,7 @@ _edje_entry_focus_in_cb(void *data, Evas_Object *o, const char *emission EINA_UN
111 if (!rp->typedata.text->entry_data) return; 111 if (!rp->typedata.text->entry_data) return;
112 112
113 ed = _edje_fetch(o); 113 ed = _edje_fetch(o);
114 if (ed) return ; 114 if (ed) return;
115 115
116 en = rp->typedata.text->entry_data; 116 en = rp->typedata.text->entry_data;
117 if (!en || !en->imf_context) return; 117 if (!en || !en->imf_context) return;
diff --git a/src/lib/edje/edje_match.c b/src/lib/edje/edje_match.c
index 5db023c761..4ebff50db0 100644
--- a/src/lib/edje/edje_match.c
+++ b/src/lib/edje/edje_match.c
@@ -727,7 +727,7 @@ edje_match_callback_exec(const Edje_Signals_Sources_Patterns *ssp,
727void 727void
728edje_match_patterns_free(Edje_Patterns *ppat) 728edje_match_patterns_free(Edje_Patterns *ppat)
729{ 729{
730 if (!ppat) return ; 730 if (!ppat) return;
731 731
732 ppat->delete_me = EINA_TRUE; 732 ppat->delete_me = EINA_TRUE;
733 ppat->ref--; 733 ppat->ref--;
diff --git a/src/lib/edje/edje_signal.c b/src/lib/edje/edje_signal.c
index 10d9a09fa0..b178371e3e 100644
--- a/src/lib/edje/edje_signal.c
+++ b/src/lib/edje/edje_signal.c
@@ -96,11 +96,11 @@ _edje_callbacks_patterns_init(Edje_Signal_Callback_Group *gp)
96 Edje_Signals_Sources_Patterns *ssp; 96 Edje_Signals_Sources_Patterns *ssp;
97 Edje_Signal_Callback_Matches *tmp; 97 Edje_Signal_Callback_Matches *tmp;
98 98
99 if (gp->matches->patterns) return ; 99 if (gp->matches->patterns) return;
100 100
101 tmp = (Edje_Signal_Callback_Matches*) gp->matches; 101 tmp = (Edje_Signal_Callback_Matches*) gp->matches;
102 tmp->patterns = calloc(1, sizeof (Edje_Signals_Sources_Patterns)); 102 tmp->patterns = calloc(1, sizeof (Edje_Signals_Sources_Patterns));
103 if (!gp->matches->patterns) return ; 103 if (!gp->matches->patterns) return;
104 104
105 ssp = gp->matches->patterns; 105 ssp = gp->matches->patterns;
106 edje_match_callback_hash_build(gp->matches->matches, 106 edje_match_callback_hash_build(gp->matches->matches,
@@ -211,7 +211,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
211 _edje_signal_callback_set(gp, i, 211 _edje_signal_callback_set(gp, i,
212 sig, src, func, data, 212 sig, src, func, data,
213 (((!!propagate) & 1) | _JUST_ADDED)); 213 (((!!propagate) & 1) | _JUST_ADDED));
214 return ; 214 return;
215 } 215 }
216 } 216 }
217 217
@@ -229,7 +229,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
229 { 229 {
230 Edje_Signal_Callback_Matches *tmp_dup; 230 Edje_Signal_Callback_Matches *tmp_dup;
231 tmp_dup = (Edje_Signal_Callback_Matches*) _edje_signal_callback_matches_dup(tmp); 231 tmp_dup = (Edje_Signal_Callback_Matches*) _edje_signal_callback_matches_dup(tmp);
232 if (!tmp_dup) return ; 232 if (!tmp_dup) return;
233 EINA_REFCOUNT_UNREF(tmp) 233 EINA_REFCOUNT_UNREF(tmp)
234 (void) 0; // Nothing to do because the case where refcount == 1 was already handle above. 234 (void) 0; // Nothing to do because the case where refcount == 1 was already handle above.
235 gp->matches = tmp_dup; 235 gp->matches = tmp_dup;
@@ -246,7 +246,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
246 _edje_signal_callback_set(gp, i, 246 _edje_signal_callback_set(gp, i,
247 sig, src, func, data, 247 sig, src, func, data,
248 (((!!propagate) & 1) | _JUST_ADDED)); 248 (((!!propagate) & 1) | _JUST_ADDED));
249 return ; 249 return;
250 } 250 }
251 if (gp->flags[i >> 1] & (_DELETE_ME << 4)) 251 if (gp->flags[i >> 1] & (_DELETE_ME << 4))
252 { 252 {
@@ -254,7 +254,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
254 _edje_signal_callback_set(gp, i + 1, 254 _edje_signal_callback_set(gp, i + 1,
255 sig, src, func, data, 255 sig, src, func, data,
256 (((!!propagate) & 1) | _JUST_ADDED)); 256 (((!!propagate) & 1) | _JUST_ADDED));
257 return ; 257 return;
258 } 258 }
259 } 259 }
260 260
@@ -264,7 +264,7 @@ _edje_signal_callback_push(const Edje_Signal_Callback_Group *cgp,
264 _edje_signal_callback_set(gp, gp->matches->matches_count - 1, 264 _edje_signal_callback_set(gp, gp->matches->matches_count - 1,
265 sig, src, func, data, (((!!propagate) & 1) | _JUST_ADDED)); 265 sig, src, func, data, (((!!propagate) & 1) | _JUST_ADDED));
266 266
267 return ; 267 return;
268} 268}
269 269
270const Edje_Signal_Callback_Group * 270const Edje_Signal_Callback_Group *
@@ -316,7 +316,7 @@ _edje_signal_callback_free(const Edje_Signal_Callback_Group *cgp)
316{ 316{
317 Edje_Signal_Callback_Group *gp = (Edje_Signal_Callback_Group*) cgp; 317 Edje_Signal_Callback_Group *gp = (Edje_Signal_Callback_Group*) cgp;
318 318
319 if (!gp) return ; 319 if (!gp) return;
320 320
321 _edje_signal_callback_matches_unref((Edje_Signal_Callback_Matches*) gp->matches); 321 _edje_signal_callback_matches_unref((Edje_Signal_Callback_Matches*) gp->matches);
322 gp->matches = NULL; 322 gp->matches = NULL;
@@ -389,7 +389,7 @@ _edje_signal_callback_move_last(Edje_Signal_Callback_Group *gp,
389 m->matches[i].func = m->matches[j].func; 389 m->matches[i].func = m->matches[j].func;
390 gp->flags[i] = (gp->flags[i >> 1] & (0xF << (((i & 1) ^ 1) * 4))) | 390 gp->flags[i] = (gp->flags[i >> 1] & (0xF << (((i & 1) ^ 1) * 4))) |
391 (gp->flags[j >> 1] & (0xF << (((j & 1) * 4)))); 391 (gp->flags[j >> 1] & (0xF << (((j & 1) * 4))));
392 return ; 392 return;
393 } 393 }
394 --m->matches_count; 394 --m->matches_count;
395 } 395 }
@@ -460,7 +460,7 @@ _edje_signal_callback_patterns_unref(const Edje_Signals_Sources_Patterns *essp)
460{ 460{
461 Edje_Signals_Sources_Patterns *ssp; 461 Edje_Signals_Sources_Patterns *ssp;
462 462
463 if (!essp) return ; 463 if (!essp) return;
464 464
465 ssp = (Edje_Signals_Sources_Patterns*) essp; 465 ssp = (Edje_Signals_Sources_Patterns*) essp;
466 466
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 14f1493c14..e4590fb396 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -212,7 +212,7 @@ _edje_limit_emit(Edje *ed, const char *limit_name, Eina_Bool over)
212 char *buffer; 212 char *buffer;
213 unsigned int length; 213 unsigned int length;
214 214
215 if (!limit_name) return ; 215 if (!limit_name) return;
216 216
217 length = strlen(limit_name) + 13; 217 length = strlen(limit_name) + 13;
218 buffer = alloca(length); 218 buffer = alloca(length);
@@ -225,7 +225,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
225{ 225{
226 unsigned int i; 226 unsigned int i;
227 227
228 if (size_next == size_current) return ; 228 if (size_next == size_current) return;
229 229
230 for (i = 0; i < length; ++i) 230 for (i = 0; i < length; ++i)
231 { 231 {
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index 964bc8353c..a6cfcc304f 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -63,7 +63,7 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
63 if (!pt) return; 63 if (!pt) return;
64 if (pt->type != EDJE_PART_TYPE_TEXT 64 if (pt->type != EDJE_PART_TYPE_TEXT
65 && pt->type != EDJE_PART_TYPE_TEXTBLOCK) 65 && pt->type != EDJE_PART_TYPE_TEXTBLOCK)
66 return ; 66 return;
67 67
68 desc = (Edje_Part_Description_Text *) pt->default_desc; 68 desc = (Edje_Part_Description_Text *) pt->default_desc;
69 if ((pt->default_desc) && (desc->text.text_class)) 69 if ((pt->default_desc) && (desc->text.text_class))
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 5cbde36a09..9df5ce14ce 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -166,7 +166,7 @@ _edje_class_member_add(Edje *ed, Eina_Hash **ehash, Eina_Hash **ghash, const cha
166 } 166 }
167 167
168 lookup = malloc(sizeof (Edje_List_Refcount)); 168 lookup = malloc(sizeof (Edje_List_Refcount));
169 if (!lookup) return ; 169 if (!lookup) return;
170 EINA_REFCOUNT_INIT(lookup); 170 EINA_REFCOUNT_INIT(lookup);
171 171
172 /* Get members list */ 172 /* Get members list */
@@ -197,7 +197,7 @@ _edje_class_member_del(Eina_Hash **ehash, Eina_Hash **ghash, const char *class)
197 if (!members) return; 197 if (!members) return;
198 198
199 lookup = eina_hash_find(*ehash, class); 199 lookup = eina_hash_find(*ehash, class);
200 if (!lookup) return ; 200 if (!lookup) return;
201 201
202 EINA_REFCOUNT_UNREF(lookup) 202 EINA_REFCOUNT_UNREF(lookup)
203 { 203 {
@@ -1457,14 +1457,14 @@ _edje_user_define_string(Edje *ed, const char *part, const char *raw_text)
1457 if (!raw_text) 1457 if (!raw_text)
1458 { 1458 {
1459 _edje_user_definition_free(eud); 1459 _edje_user_definition_free(eud);
1460 return ; 1460 return;
1461 } 1461 }
1462 eud->u.string.text = raw_text; 1462 eud->u.string.text = raw_text;
1463 return ; 1463 return;
1464 } 1464 }
1465 1465
1466 eud = _edje_user_definition_new(EDJE_USER_STRING, part, ed); 1466 eud = _edje_user_definition_new(EDJE_USER_STRING, part, ed);
1467 if (!eud) return ; 1467 if (!eud) return;
1468 eud->u.string.text = raw_text; 1468 eud->u.string.text = raw_text;
1469} 1469}
1470 1470
@@ -3740,7 +3740,7 @@ _part_unswallow(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
3740 if (eud->type == EDJE_USER_SWALLOW && eud->u.swallow.child == obj_swallow) 3740 if (eud->type == EDJE_USER_SWALLOW && eud->u.swallow.child == obj_swallow)
3741 { 3741 {
3742 _edje_user_definition_free(eud); 3742 _edje_user_definition_free(eud);
3743 return ; 3743 return;
3744 } 3744 }
3745 } 3745 }
3746 } 3746 }
@@ -5780,8 +5780,8 @@ _update_hints_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
5780 Eina_Bool update = va_arg(*list, int); 5780 Eina_Bool update = va_arg(*list, int);
5781 Edje *ed = _pd; 5781 Edje *ed = _pd;
5782 5782
5783 if (!ed) return ; 5783 if (!ed) return;
5784 if (ed->update_hints == !!update) return ; 5784 if (ed->update_hints == !!update) return;
5785 5785
5786 ed->update_hints = !!update; 5786 ed->update_hints = !!update;
5787 if (update) 5787 if (update)
diff --git a/src/lib/eet/eet_data.c b/src/lib/eet/eet_data.c
index e2001c0254..98671e06f3 100644
--- a/src/lib/eet/eet_data.c
+++ b/src/lib/eet/eet_data.c
@@ -1958,30 +1958,30 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
1958 type >= EET_T_LAST) 1958 type >= EET_T_LAST)
1959 { 1959 {
1960 CRIT("Preventing later bug due to unknow type: %i", type); 1960 CRIT("Preventing later bug due to unknow type: %i", type);
1961 return ; 1961 return;
1962 } 1962 }
1963 if (offset < 0) 1963 if (offset < 0)
1964 { 1964 {
1965 CRIT("Preventing later buffer underrun : offset = %i", offset); 1965 CRIT("Preventing later buffer underrun : offset = %i", offset);
1966 return ; 1966 return;
1967 } 1967 }
1968 if (offset > edd->size) 1968 if (offset > edd->size)
1969 { 1969 {
1970 CRIT("Preventing later buffer overrun : offset = %i in a structure of %i bytes", offset, edd->size); 1970 CRIT("Preventing later buffer overrun : offset = %i in a structure of %i bytes", offset, edd->size);
1971 return ; 1971 return;
1972 } 1972 }
1973 if (group_type == EET_G_UNKNOWN && type != EET_T_UNKNOW) 1973 if (group_type == EET_G_UNKNOWN && type != EET_T_UNKNOW)
1974 { 1974 {
1975 if (offset + eet_basic_codec[type - 1].size > edd->size) 1975 if (offset + eet_basic_codec[type - 1].size > edd->size)
1976 { 1976 {
1977 CRIT("Preventing later buffer overrun : offset = %i, size = %i in a structure of %i bytes", offset, eet_basic_codec[type - 1].size, edd->size); 1977 CRIT("Preventing later buffer overrun : offset = %i, size = %i in a structure of %i bytes", offset, eet_basic_codec[type - 1].size, edd->size);
1978 return ; 1978 return;
1979 } 1979 }
1980 } 1980 }
1981 else if ((offset + sizeof (void*)) > (unsigned int) edd->size) 1981 else if ((offset + sizeof (void*)) > (unsigned int) edd->size)
1982 { 1982 {
1983 CRIT("Preventing later buffer overrun : offset = %i, estimated size = %zu in a structure of %i bytes", offset, sizeof (void*), edd->size); 1983 CRIT("Preventing later buffer overrun : offset = %i, estimated size = %zu in a structure of %i bytes", offset, sizeof (void*), edd->size);
1984 return ; 1984 return;
1985 } 1985 }
1986 1986
1987 /* UNION, VARIANT type would not work with simple type, we need a way to map the type. */ 1987 /* UNION, VARIANT type would not work with simple type, we need a way to map the type. */
diff --git a/src/lib/efreet/efreet_mime.c b/src/lib/efreet/efreet_mime.c
index d112fe4f27..15cb5ff751 100644
--- a/src/lib/efreet/efreet_mime.c
+++ b/src/lib/efreet/efreet_mime.c
@@ -836,7 +836,7 @@ efreet_mime_mime_types_load(const char *file)
836 836
837 EINA_SAFETY_ON_NULL_RETURN(file); 837 EINA_SAFETY_ON_NULL_RETURN(file);
838 f = eina_file_open(file, 0); 838 f = eina_file_open(file, 0);
839 if (!f) return ; 839 if (!f) return;
840 840
841 it = eina_file_map_lines(f); 841 it = eina_file_map_lines(f);
842 if (it) 842 if (it)
diff --git a/src/lib/eina/eina_accessor.c b/src/lib/eina/eina_accessor.c
index 994704dba9..fa56a69ab0 100644
--- a/src/lib/eina/eina_accessor.c
+++ b/src/lib/eina/eina_accessor.c
@@ -135,7 +135,7 @@ eina_accessor_over(Eina_Accessor *accessor,
135 void *data; 135 void *data;
136 unsigned int i; 136 unsigned int i;
137 137
138 if (!accessor) return ; 138 if (!accessor) return;
139 139
140 EINA_MAGIC_CHECK_ACCESSOR(accessor); 140 EINA_MAGIC_CHECK_ACCESSOR(accessor);
141 EINA_SAFETY_ON_NULL_RETURN(accessor->get_container); 141 EINA_SAFETY_ON_NULL_RETURN(accessor->get_container);
@@ -144,7 +144,7 @@ eina_accessor_over(Eina_Accessor *accessor,
144 EINA_SAFETY_ON_FALSE_RETURN(start < end); 144 EINA_SAFETY_ON_FALSE_RETURN(start < end);
145 145
146 if (!eina_accessor_lock(accessor)) 146 if (!eina_accessor_lock(accessor))
147 return ; 147 return;
148 148
149 container = accessor->get_container(accessor); 149 container = accessor->get_container(accessor);
150 for (i = start; i < end && accessor->get_at(accessor, i, &data) == EINA_TRUE; 150 for (i = start; i < end && accessor->get_at(accessor, i, &data) == EINA_TRUE;
diff --git a/src/lib/eina/eina_array.c b/src/lib/eina/eina_array.c
index 4bcab61a71..b460acfa32 100644
--- a/src/lib/eina/eina_array.c
+++ b/src/lib/eina/eina_array.c
@@ -309,7 +309,7 @@ eina_array_step_set(Eina_Array *array,
309 (int) sizeof (Eina_Array)); 309 (int) sizeof (Eina_Array));
310 /* Force memory to zero to provide a small layer of security */ 310 /* Force memory to zero to provide a small layer of security */
311 memset(array, 0, sizeof_eina_array); 311 memset(array, 0, sizeof_eina_array);
312 return ; 312 return;
313 } 313 }
314 314
315 array->version = EINA_ARRAY_VERSION; 315 array->version = EINA_ARRAY_VERSION;
diff --git a/src/lib/eina/eina_cow.c b/src/lib/eina/eina_cow.c
index 28aa3d1797..64c1b3fb75 100644
--- a/src/lib/eina/eina_cow.c
+++ b/src/lib/eina/eina_cow.c
@@ -203,7 +203,7 @@ _eina_cow_hash_del(Eina_Cow *cow,
203 Eina_Cow_Ptr *ref) 203 Eina_Cow_Ptr *ref)
204{ 204{
205 /* eina_cow_gc is not supposed to be thread safe */ 205 /* eina_cow_gc is not supposed to be thread safe */
206 if (!ref->hashed) return ; 206 if (!ref->hashed) return;
207 207
208 current_cow_size = cow->struct_size; 208 current_cow_size = cow->struct_size;
209 eina_hash_del(cow->match, data, data); 209 eina_hash_del(cow->match, data, data);
@@ -220,7 +220,7 @@ static inline void
220_eina_cow_togc_del(Eina_Cow *cow, Eina_Cow_Ptr *ref) 220_eina_cow_togc_del(Eina_Cow *cow, Eina_Cow_Ptr *ref)
221{ 221{
222 /* eina_cow_gc is not supposed to be thread safe */ 222 /* eina_cow_gc is not supposed to be thread safe */
223 if (!ref->togc) return ; 223 if (!ref->togc) return;
224 eina_hash_del(cow->togc, &ref, NULL); 224 eina_hash_del(cow->togc, &ref, NULL);
225 ref->togc = EINA_FALSE; 225 ref->togc = EINA_FALSE;
226} 226}
@@ -233,13 +233,13 @@ _eina_cow_togc_add(Eina_Cow *cow,
233 Eina_Cow_GC *gc; 233 Eina_Cow_GC *gc;
234 234
235 /* needed if we want to make cow gc safe */ 235 /* needed if we want to make cow gc safe */
236 if (ref->togc) return ; 236 if (ref->togc) return;
237#ifndef NVALGRIND 237#ifndef NVALGRIND
238 VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref)); 238 VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref));
239#endif 239#endif
240 240
241 gc = eina_mempool_malloc(gc_pool, sizeof (Eina_Cow_GC)); 241 gc = eina_mempool_malloc(gc_pool, sizeof (Eina_Cow_GC));
242 if (!gc) return ; /* That one will not get gced this time */ 242 if (!gc) return; /* That one will not get gced this time */
243 243
244 gc->ref = ref; 244 gc->ref = ref;
245 gc->dst = dst; 245 gc->dst = dst;
@@ -390,7 +390,7 @@ eina_cow_add(const char *name, unsigned int struct_size, unsigned int step, cons
390EAPI void 390EAPI void
391eina_cow_del(Eina_Cow *cow) 391eina_cow_del(Eina_Cow *cow)
392{ 392{
393 if (!cow) return ; 393 if (!cow) return;
394 394
395#ifdef EINA_COW_MAGIC_ON 395#ifdef EINA_COW_MAGIC_ON
396 EINA_COW_MAGIC_CHECK(cow); 396 EINA_COW_MAGIC_CHECK(cow);
@@ -421,8 +421,8 @@ eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data *data)
421 EINA_COW_MAGIC_CHECK(cow); 421 EINA_COW_MAGIC_CHECK(cow);
422#endif 422#endif
423 423
424 if (!data) return ; 424 if (!data) return;
425 if (cow->default_value == data) return ; 425 if (cow->default_value == data) return;
426 426
427 ref = EINA_COW_PTR_GET(data); 427 ref = EINA_COW_PTR_GET(data);
428#ifndef NVALGRIND 428#ifndef NVALGRIND
@@ -435,7 +435,7 @@ eina_cow_free(Eina_Cow *cow, const Eina_Cow_Data *data)
435#ifndef NVALGRIND 435#ifndef NVALGRIND
436 VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref)); 436 VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref));
437#endif 437#endif
438 return ; 438 return;
439 } 439 }
440 440
441#ifdef EINA_COW_MAGIC_ON 441#ifdef EINA_COW_MAGIC_ON
@@ -552,7 +552,7 @@ eina_cow_done(Eina_Cow *cow,
552 VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref)); 552 VALGRIND_MAKE_MEM_NOACCESS(ref, sizeof (*ref));
553#endif 553#endif
554 554
555 if (!cow->togc || !needed_gc) return ; 555 if (!cow->togc || !needed_gc) return;
556 556
557#ifndef NVALGRIND 557#ifndef NVALGRIND
558 VALGRIND_MAKE_MEM_DEFINED(ref, sizeof (*ref)); 558 VALGRIND_MAKE_MEM_DEFINED(ref, sizeof (*ref));
@@ -570,7 +570,7 @@ eina_cow_memcpy(Eina_Cow *cow,
570 570
571 EINA_COW_MAGIC_CHECK(cow); 571 EINA_COW_MAGIC_CHECK(cow);
572 572
573 if (*dst == src) return ; 573 if (*dst == src) return;
574 574
575 if (src != cow->default_value) 575 if (src != cow->default_value)
576 { 576 {
diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index ca1c487acd..d012deaec7 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -167,7 +167,7 @@ eina_file_close(Eina_File *file)
167 eina_lock_take(&file->lock); 167 eina_lock_take(&file->lock);
168 file->refcount--; 168 file->refcount--;
169 eina_lock_release(&file->lock); 169 eina_lock_release(&file->lock);
170 if (file->refcount != 0) return ; 170 if (file->refcount != 0) return;
171 171
172 eina_lock_take(&_eina_file_lock_cache); 172 eina_lock_take(&_eina_file_lock_cache);
173 173
diff --git a/src/lib/eina/eina_inarray.c b/src/lib/eina/eina_inarray.c
index 7da4e461d5..1e962e4961 100644
--- a/src/lib/eina/eina_inarray.c
+++ b/src/lib/eina/eina_inarray.c
@@ -379,7 +379,7 @@ eina_inarray_step_set(Eina_Inarray *array,
379 (int) sizeof (Eina_Inarray)); 379 (int) sizeof (Eina_Inarray));
380 /* Force memory to zero to provide a small layer of security */ 380 /* Force memory to zero to provide a small layer of security */
381 memset(array, 0, sizeof_eina_inarray); 381 memset(array, 0, sizeof_eina_inarray);
382 return ; 382 return;
383 } 383 }
384 384
385 _eina_inarray_setup(array, member_size, step); 385 _eina_inarray_setup(array, member_size, step);
diff --git a/src/lib/eina/eina_iterator.c b/src/lib/eina/eina_iterator.c
index d035873f73..59dc106011 100644
--- a/src/lib/eina/eina_iterator.c
+++ b/src/lib/eina/eina_iterator.c
@@ -140,7 +140,7 @@ eina_iterator_foreach(Eina_Iterator *iterator,
140 EINA_SAFETY_ON_NULL_RETURN(iterator->next); 140 EINA_SAFETY_ON_NULL_RETURN(iterator->next);
141 EINA_SAFETY_ON_NULL_RETURN(cb); 141 EINA_SAFETY_ON_NULL_RETURN(cb);
142 142
143 if (!eina_iterator_lock(iterator)) return ; 143 if (!eina_iterator_lock(iterator)) return;
144 144
145 container = iterator->get_container(iterator); 145 container = iterator->get_container(iterator);
146 while (iterator->next(iterator, &data) == EINA_TRUE) 146 while (iterator->next(iterator, &data) == EINA_TRUE)
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index dbdec6f211..d9dabe24fb 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -2172,7 +2172,7 @@ eina_log_timing(int domain,
2172 Eina_Log_Domain *d; 2172 Eina_Log_Domain *d;
2173 Eina_Log_Timing *t; 2173 Eina_Log_Timing *t;
2174 2174
2175 if (_disable_timing) return ; 2175 if (_disable_timing) return;
2176 2176
2177 d = _log_domains + domain; 2177 d = _log_domains + domain;
2178 t = _log_timing + domain; 2178 t = _log_timing + domain;
@@ -2187,11 +2187,11 @@ eina_log_timing(int domain,
2187#endif 2187#endif
2188 2188
2189 if (!t->phase && state == EINA_LOG_STATE_STOP) 2189 if (!t->phase && state == EINA_LOG_STATE_STOP)
2190 return ; 2190 return;
2191 2191
2192 if (t->phase == EINA_LOG_STATE_INIT && 2192 if (t->phase == EINA_LOG_STATE_INIT &&
2193 phase == EINA_LOG_STATE_SHUTDOWN) 2193 phase == EINA_LOG_STATE_SHUTDOWN)
2194 return ; 2194 return;
2195 2195
2196 if (state == EINA_LOG_STATE_START && 2196 if (state == EINA_LOG_STATE_START &&
2197 t->phase && 2197 t->phase &&
diff --git a/src/lib/eina/eina_object.c b/src/lib/eina/eina_object.c
index 218c9e0d44..5a13950944 100644
--- a/src/lib/eina/eina_object.c
+++ b/src/lib/eina/eina_object.c
@@ -760,7 +760,7 @@ eina_object_del(Eina_Class *class,
760{ 760{
761 Eina_Object_Item *item; 761 Eina_Object_Item *item;
762 762
763 if (!object) return ; 763 if (!object) return;
764 EINA_MAGIC_CHECK_CLASS(class); 764 EINA_MAGIC_CHECK_CLASS(class);
765 765
766 if (!eina_lock_take(&class->mutex)) 766 if (!eina_lock_take(&class->mutex))
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 {
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index b3748222dd..358cccab20 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -697,7 +697,7 @@ emotion_object_position_set(Evas_Object *obj, double sec)
697 if (!sd->open) 697 if (!sd->open)
698 { 698 {
699 sd->remember_jump = sec; 699 sd->remember_jump = sec;
700 return ; 700 return;
701 } 701 }
702 sd->remember_jump = 0; 702 sd->remember_jump = 0;
703 sd->seek_pos = sec; 703 sd->seek_pos = sec;
@@ -1276,17 +1276,17 @@ emotion_object_last_position_load(Evas_Object *obj)
1276#endif 1276#endif
1277 1277
1278 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); 1278 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
1279 if (!sd->file) return ; 1279 if (!sd->file) return;
1280 1280
1281 if (!strncmp(sd->file, "file://", 7)) 1281 if (!strncmp(sd->file, "file://", 7))
1282 tmp = sd->file + 7; 1282 tmp = sd->file + 7;
1283 else if (!strstr(sd->file, "://")) 1283 else if (!strstr(sd->file, "://"))
1284 tmp = sd->file; 1284 tmp = sd->file;
1285 else 1285 else
1286 return ; 1286 return;
1287 1287
1288#ifdef HAVE_EIO 1288#ifdef HAVE_EIO
1289 if (sd->load_xattr) return ; 1289 if (sd->load_xattr) return;
1290 1290
1291 EINA_REFCOUNT_REF(sd); 1291 EINA_REFCOUNT_REF(sd);
1292 1292
@@ -1348,17 +1348,17 @@ emotion_object_last_position_save(Evas_Object *obj)
1348 const char *tmp; 1348 const char *tmp;
1349 1349
1350 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME); 1350 E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
1351 if (!sd->file) return ; 1351 if (!sd->file) return;
1352 1352
1353 if (!strncmp(sd->file, "file://", 7)) 1353 if (!strncmp(sd->file, "file://", 7))
1354 tmp = sd->file + 7; 1354 tmp = sd->file + 7;
1355 else if (!strstr(sd->file, "://")) 1355 else if (!strstr(sd->file, "://"))
1356 tmp = sd->file; 1356 tmp = sd->file;
1357 else 1357 else
1358 return ; 1358 return;
1359 1359
1360#ifdef HAVE_EIO 1360#ifdef HAVE_EIO
1361 if (sd->save_xattr) return ; 1361 if (sd->save_xattr) return;
1362 1362
1363 EINA_REFCOUNT_REF(sd); 1363 EINA_REFCOUNT_REF(sd);
1364 1364
diff --git a/src/lib/emotion/emotion_webcam.c b/src/lib/emotion/emotion_webcam.c
index 11bd0663f5..1f74a7d3aa 100644
--- a/src/lib/emotion/emotion_webcam.c
+++ b/src/lib/emotion/emotion_webcam.c
@@ -98,7 +98,7 @@ _emotion_check_device(Emotion_Webcam *ew)
98 int fd; 98 int fd;
99#endif 99#endif
100 100
101 if (!ew) return ; 101 if (!ew) return;
102#ifdef HAVE_V4L2 102#ifdef HAVE_V4L2
103 if (!ew->device) goto on_error; 103 if (!ew->device) goto on_error;
104 104
@@ -122,7 +122,7 @@ _emotion_check_device(Emotion_Webcam *ew)
122 122
123 EINA_REFCOUNT_INIT(ew); 123 EINA_REFCOUNT_INIT(ew);
124 124
125 return ; 125 return;
126 126
127 on_error: 127 on_error:
128#endif 128#endif
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index 78cd66cc18..ad49444031 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -1171,7 +1171,7 @@ ethumb_thumb_hash_copy(Ethumb *dst, const Ethumb *src)
1171 EINA_SAFETY_ON_NULL_RETURN(dst); 1171 EINA_SAFETY_ON_NULL_RETURN(dst);
1172 EINA_SAFETY_ON_NULL_RETURN(src); 1172 EINA_SAFETY_ON_NULL_RETURN(src);
1173 1173
1174 if (src == dst) return ; 1174 if (src == dst) return;
1175 1175
1176 eina_stringshare_del(dst->src_hash); 1176 eina_stringshare_del(dst->src_hash);
1177 dst->src_hash = eina_stringshare_ref(src->src_hash); 1177 dst->src_hash = eina_stringshare_ref(src->src_hash);
diff --git a/src/lib/evas/cache/evas_cache_engine_image.c b/src/lib/evas/cache/evas_cache_engine_image.c
index ffe2d595c5..eb39b36356 100644
--- a/src/lib/evas/cache/evas_cache_engine_image.c
+++ b/src/lib/evas/cache/evas_cache_engine_image.c
@@ -388,7 +388,7 @@ evas_cache_engine_image_drop(Engine_Image_Entry *eim)
388 if (eim->flags.dirty) 388 if (eim->flags.dirty)
389 { 389 {
390 _evas_cache_engine_image_dealloc(cache, eim); 390 _evas_cache_engine_image_dealloc(cache, eim);
391 return ; 391 return;
392 } 392 }
393 393
394 if (eim->references == 0) 394 if (eim->references == 0)
@@ -396,7 +396,7 @@ evas_cache_engine_image_drop(Engine_Image_Entry *eim)
396 _evas_cache_engine_image_remove_activ(cache, eim); 396 _evas_cache_engine_image_remove_activ(cache, eim);
397 _evas_cache_engine_image_make_inactive(cache, eim, eim->cache_key); 397 _evas_cache_engine_image_make_inactive(cache, eim, eim->cache_key);
398 evas_cache_engine_image_flush(cache); 398 evas_cache_engine_image_flush(cache);
399 return ; 399 return;
400 } 400 }
401} 401}
402 402
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index e4df1f8d80..f51021f310 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -307,7 +307,7 @@ _canvas_output_method_set(Eo *eo_e, void *_pd, va_list *list)
307 if (e->output.render_method != RENDER_METHOD_INVALID) return; 307 if (e->output.render_method != RENDER_METHOD_INVALID) return;
308 /* Request the right engine. */ 308 /* Request the right engine. */
309 em = evas_module_engine_get(render_method); 309 em = evas_module_engine_get(render_method);
310 if (!em) return ; 310 if (!em) return;
311 if (em->id_engine != render_method) return; 311 if (em->id_engine != render_method) return;
312 if (!evas_module_load(em)) return; 312 if (!evas_module_load(em)) return;
313 313
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 2a6873af35..d0bba41f31 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -1240,7 +1240,7 @@ evas_object_map_update(Evas_Object *eo_obj,
1240 obj->changed_map = EINA_TRUE; 1240 obj->changed_map = EINA_TRUE;
1241 } 1241 }
1242 1242
1243 if (!obj->changed_map) return ; 1243 if (!obj->changed_map) return;
1244 1244
1245 if (obj->map->cur.map && obj->map->spans && obj->map->cur.map->count != obj->map->spans->count) 1245 if (obj->map->cur.map && obj->map->spans && obj->map->cur.map->count != obj->map->spans->count)
1246 { 1246 {
@@ -1264,7 +1264,7 @@ evas_object_map_update(Evas_Object *eo_obj,
1264 EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write); 1264 EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write);
1265 } 1265 }
1266 1266
1267 if (!obj->map->spans) return ; 1267 if (!obj->map->spans) return;
1268 1268
1269 EINA_COW_WRITE_BEGIN(evas_object_map_cow, obj->map, Evas_Object_Map_Data, map_write) 1269 EINA_COW_WRITE_BEGIN(evas_object_map_cow, obj->map, Evas_Object_Map_Data, map_write)
1270 { 1270 {
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index e89f442968..338c180ce2 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -309,7 +309,7 @@ _constructor(Eo *eo_obj, void *class_data, va_list *list EINA_UNUSED)
309 evas_object_inject(eo_obj, obj, eo_e); 309 evas_object_inject(eo_obj, obj, eo_e);
310 310
311 if (!_init_cow(eo_obj)) 311 if (!_init_cow(eo_obj))
312 return ; 312 return;
313 313
314 o->load_opts = eina_cow_alloc(evas_object_image_load_opts_cow); 314 o->load_opts = eina_cow_alloc(evas_object_image_load_opts_cow);
315 o->pixels = eina_cow_alloc(evas_object_image_pixels_cow); 315 o->pixels = eina_cow_alloc(evas_object_image_pixels_cow);
@@ -1670,7 +1670,7 @@ EAPI void
1670evas_object_image_preload(Evas_Object *eo_obj, Eina_Bool cancel) 1670evas_object_image_preload(Evas_Object *eo_obj, Eina_Bool cancel)
1671{ 1671{
1672 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1672 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1673 return ; 1673 return;
1674 MAGIC_CHECK_END(); 1674 MAGIC_CHECK_END();
1675 if (cancel) 1675 if (cancel)
1676 eo_do(eo_obj, evas_obj_image_preload_cancel()); 1676 eo_do(eo_obj, evas_obj_image_preload_cancel());
@@ -2489,7 +2489,7 @@ _image_load_orientation_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
2489 Eina_Bool enable = va_arg(*list, int); 2489 Eina_Bool enable = va_arg(*list, int);
2490 Evas_Object_Image *o = _pd; 2490 Evas_Object_Image *o = _pd;
2491 2491
2492 if (o->load_opts->orientation == !!enable) return ; 2492 if (o->load_opts->orientation == !!enable) return;
2493 2493
2494 EINA_COW_LOAD_OPTS_WRITE_BEGIN(o, low) 2494 EINA_COW_LOAD_OPTS_WRITE_BEGIN(o, low)
2495 low->orientation = !!enable; 2495 low->orientation = !!enable;
@@ -2585,14 +2585,14 @@ _image_video_surface_set(Eo *eo_obj, void *_pd, va_list *list)
2585 2585
2586 if (surf) 2586 if (surf)
2587 { 2587 {
2588 if (surf->version != EVAS_VIDEO_SURFACE_VERSION) return ; 2588 if (surf->version != EVAS_VIDEO_SURFACE_VERSION) return;
2589 2589
2590 if (!surf->update_pixels || 2590 if (!surf->update_pixels ||
2591 !surf->move || 2591 !surf->move ||
2592 !surf->resize || 2592 !surf->resize ||
2593 !surf->hide || 2593 !surf->hide ||
2594 !surf->show) 2594 !surf->show)
2595 return ; 2595 return;
2596 2596
2597 o->created = EINA_TRUE; 2597 o->created = EINA_TRUE;
2598 o->video_surface = EINA_TRUE; 2598 o->video_surface = EINA_TRUE;
@@ -2612,7 +2612,7 @@ _image_video_surface_set(Eo *eo_obj, void *_pd, va_list *list)
2612 !o->pixels->video.hide && 2612 !o->pixels->video.hide &&
2613 !o->pixels->video.show && 2613 !o->pixels->video.show &&
2614 !o->pixels->video.data) 2614 !o->pixels->video.data)
2615 return ; 2615 return;
2616 2616
2617 o->video_surface = EINA_FALSE; 2617 o->video_surface = EINA_FALSE;
2618 EINA_COW_PIXEL_WRITE_BEGIN(o, pixi_write) 2618 EINA_COW_PIXEL_WRITE_BEGIN(o, pixi_write)
@@ -3607,7 +3607,7 @@ _evas_object_image_free(Evas_Object *obj)
3607{ 3607{
3608 Evas_Object_Image *o; 3608 Evas_Object_Image *o;
3609 3609
3610 if (!eo_isa(obj, MY_CLASS)) return ; 3610 if (!eo_isa(obj, MY_CLASS)) return;
3611 3611
3612 o = eo_data_scope_get(obj, MY_CLASS); 3612 o = eo_data_scope_get(obj, MY_CLASS);
3613 3613
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index e5c2a0cd80..7a002ba844 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1169,9 +1169,9 @@ evas_object_update_bounding_box(Evas_Object *eo_obj, Evas_Object_Protected_Data
1169 Evas_Coord px, py, pw, ph; 1169 Evas_Coord px, py, pw, ph;
1170 Eina_Bool noclip; 1170 Eina_Bool noclip;
1171 1171
1172 if (!obj->smart.parent) return ; 1172 if (!obj->smart.parent) return;
1173 1173
1174 if (obj->child_has_map) return ; /* Disable bounding box computation for this object and its parent */ 1174 if (obj->child_has_map) return; /* Disable bounding box computation for this object and its parent */
1175 /* We could also remove object that are not visible from the bounding box, use the clipping information 1175 /* We could also remove object that are not visible from the bounding box, use the clipping information
1176 to reduce the bounding of the object they are clipping, but for the moment this will do it's jobs */ 1176 to reduce the bounding of the object they are clipping, but for the moment this will do it's jobs */
1177 noclip = !(obj->clip.clipees || obj->is_static_clip); 1177 noclip = !(obj->clip.clipees || obj->is_static_clip);
@@ -1426,7 +1426,7 @@ evas_object_smart_need_bounding_box_update(Evas_Object *eo_obj)
1426 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1426 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
1427 Evas_Object_Smart *o = eo_data_scope_get(eo_obj, MY_CLASS); 1427 Evas_Object_Smart *o = eo_data_scope_get(eo_obj, MY_CLASS);
1428 1428
1429 if (o->update_boundingbox_needed) return ; 1429 if (o->update_boundingbox_needed) return;
1430 o->update_boundingbox_needed = EINA_TRUE; 1430 o->update_boundingbox_needed = EINA_TRUE;
1431 1431
1432 if (obj->smart.parent) evas_object_smart_need_bounding_box_update(obj->smart.parent); 1432 if (obj->smart.parent) evas_object_smart_need_bounding_box_update(obj->smart.parent);
@@ -1449,7 +1449,7 @@ evas_object_smart_bounding_box_update(Evas_Object *eo_obj, Evas_Object_Protected
1449 1449
1450 os = eo_data_scope_get(eo_obj, MY_CLASS); 1450 os = eo_data_scope_get(eo_obj, MY_CLASS);
1451 1451
1452 if (!os->update_boundingbox_needed) return ; 1452 if (!os->update_boundingbox_needed) return;
1453 os->update_boundingbox_needed = EINA_FALSE; 1453 os->update_boundingbox_needed = EINA_FALSE;
1454 1454
1455 minx = obj->layer->evas->output.w; 1455 minx = obj->layer->evas->output.w;
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index c36f6d5ba1..574bcf6329 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -692,7 +692,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Object_Text *o, Eina_Unicode
692 obj->cur->scale == obj->prev->scale && 692 obj->cur->scale == obj->prev->scale &&
693 o->last_computed.w == obj->cur->geometry.w && 693 o->last_computed.w == obj->cur->geometry.w &&
694 o->last_computed.h == obj->cur->geometry.h) 694 o->last_computed.h == obj->cur->geometry.h)
695 return ; 695 return;
696 696
697 evas_object_content_change(eo_obj, obj); 697 evas_object_content_change(eo_obj, obj);
698 698
@@ -921,7 +921,7 @@ _text_ellipsis_set(Eo *eo_obj, void *_pd, va_list *list)
921 Evas_Object_Text *o = _pd; 921 Evas_Object_Text *o = _pd;
922 double ellipsis = va_arg(*list, double); 922 double ellipsis = va_arg(*list, double);
923 923
924 if (o->cur.ellipsis == ellipsis) return ; 924 if (o->cur.ellipsis == ellipsis) return;
925 925
926 o->cur.ellipsis = ellipsis; 926 o->cur.ellipsis = ellipsis;
927 o->changed = 1; 927 o->changed = 1;
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index c5c7a3e1c8..c57656c085 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -694,7 +694,7 @@ evas_object_textgrid_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
694 if (!fad) 694 if (!fad)
695 { 695 {
696 ERR("Failed to allocate Evas_Font_Array_Data."); 696 ERR("Failed to allocate Evas_Font_Array_Data.");
697 return ; 697 return;
698 } 698 }
699 699
700 for (xx = 0; xx < row->texts_num; xx++) 700 for (xx = 0; xx < row->texts_num; xx++)
@@ -1407,7 +1407,7 @@ _palette_set(Eo *eo_obj, void *_pd, va_list *list)
1407 color->r == r && 1407 color->r == r &&
1408 color->g == g && 1408 color->g == g &&
1409 color->b == b) 1409 color->b == b)
1410 return ; 1410 return;
1411 } 1411 }
1412 else 1412 else
1413 { 1413 {
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index c6cfebf504..e72bf697b8 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -751,7 +751,7 @@ clean_stuff:
751 OBJS_ARRAY_CLEAN(&e->restack_objects); 751 OBJS_ARRAY_CLEAN(&e->restack_objects);
752 OBJS_ARRAY_CLEAN(&e->delete_objects); 752 OBJS_ARRAY_CLEAN(&e->delete_objects);
753 e->invalidate = EINA_TRUE; 753 e->invalidate = EINA_TRUE;
754 return ; 754 return;
755 } 755 }
756 } 756 }
757} 757}
diff --git a/src/lib/evas/common/evas_draw_main.c b/src/lib/evas/common/evas_draw_main.c
index 296ffe849b..16078b8181 100644
--- a/src/lib/evas/common/evas_draw_main.c
+++ b/src/lib/evas/common/evas_draw_main.c
@@ -14,7 +14,7 @@ evas_common_draw_context_cutouts_new(void)
14EAPI void 14EAPI void
15evas_common_draw_context_cutouts_free(Cutout_Rects* rects) 15evas_common_draw_context_cutouts_free(Cutout_Rects* rects)
16{ 16{
17 if (!rects) return ; 17 if (!rects) return;
18 rects->active = 0; 18 rects->active = 0;
19} 19}
20 20
diff --git a/src/lib/evas/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c
index 184c4779a7..aa334b88ff 100644
--- a/src/lib/evas/common/evas_font_draw.c
+++ b/src/lib/evas/common/evas_font_draw.c
@@ -445,7 +445,7 @@ evas_common_font_draw_do(const Cutout_Rects *reuse, const Eina_Rectangle *clip,
445 dc->clip.x, dc->clip.y, 445 dc->clip.x, dc->clip.y,
446 dc->clip.w, dc->clip.h, 446 dc->clip.w, dc->clip.h,
447 im_w, im_h); 447 im_w, im_h);
448 return ; 448 return;
449 } 449 }
450 450
451 for (i = 0; i < reuse->active; ++i) 451 for (i = 0; i < reuse->active; ++i)
diff --git a/src/lib/evas/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c
index 2e1ce0ecec..f12db1eb45 100644
--- a/src/lib/evas/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -921,7 +921,7 @@ evas_common_font_flush_last(void)
921{ 921{
922 RGBA_Font_Int *fi = NULL; 922 RGBA_Font_Int *fi = NULL;
923 923
924 if (!fonts_lru) return ; 924 if (!fonts_lru) return;
925 fi = eina_list_data_get(fonts_lru); 925 fi = eina_list_data_get(fonts_lru);
926 fonts_lru = eina_list_remove_list(fonts_lru, fonts_lru); 926 fonts_lru = eina_list_remove_list(fonts_lru, fonts_lru);
927 eina_hash_del(fonts, fi, fi); 927 eina_hash_del(fonts, fi, fi);
diff --git a/src/lib/evas/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c
index 5d125784fc..862e6cda4c 100644
--- a/src/lib/evas/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -908,8 +908,8 @@ evas_common_image_premul(Image_Entry *ie)
908{ 908{
909 DATA32 nas = 0; 909 DATA32 nas = 0;
910 910
911 if (!ie) return ; 911 if (!ie) return;
912 if (!evas_cache_image_pixels(ie)) return ; 912 if (!evas_cache_image_pixels(ie)) return;
913 if (!ie->flags.alpha) return; 913 if (!ie->flags.alpha) return;
914 914
915 nas = evas_common_convert_argb_premul(evas_cache_image_pixels(ie), ie->w * ie->h); 915 nas = evas_common_convert_argb_premul(evas_cache_image_pixels(ie), ie->w * ie->h);
@@ -924,7 +924,7 @@ evas_common_image_set_alpha_sparse(Image_Entry *ie)
924 DATA32 nas = 0; 924 DATA32 nas = 0;
925 925
926 if (!ie) return; 926 if (!ie) return;
927 if (!evas_cache_image_pixels(ie)) return ; 927 if (!evas_cache_image_pixels(ie)) return;
928 if (!ie->flags.alpha) return; 928 if (!ie->flags.alpha) return;
929 929
930 s = evas_cache_image_pixels(ie); 930 s = evas_cache_image_pixels(ie);
diff --git a/src/lib/evas/common/evas_map_image.c b/src/lib/evas/common/evas_map_image.c
index 742ab74eae..8cdcf63d0e 100644
--- a/src/lib/evas/common/evas_map_image.c
+++ b/src/lib/evas/common/evas_map_image.c
@@ -450,7 +450,7 @@ _rgba_map_cutout_resize(RGBA_Map *m, int count)
450 450
451 if (old && old->count == count) 451 if (old && old->count == count)
452 { 452 {
453 return ; 453 return;
454 } 454 }
455 455
456 size = sizeof (RGBA_Map_Cutout) + sizeof (RGBA_Map_Spans) * (count - 1); 456 size = sizeof (RGBA_Map_Cutout) + sizeof (RGBA_Map_Spans) * (count - 1);
@@ -471,11 +471,11 @@ _rgba_map_cutout_resize(RGBA_Map *m, int count)
471 memset(r, 0, size); 471 memset(r, 0, size);
472 m->engine_data = r; 472 m->engine_data = r;
473 r->count = count; 473 r->count = count;
474 return ; 474 return;
475 475
476 empty: 476 empty:
477 evas_common_map_rgba_clean(m); 477 evas_common_map_rgba_clean(m);
478 return ; 478 return;
479} 479}
480 480
481static void 481static void
diff --git a/src/lib/evas/common/evas_pipe.c b/src/lib/evas/common/evas_pipe.c
index 4c08bc5054..6937907efa 100644
--- a/src/lib/evas/common/evas_pipe.c
+++ b/src/lib/evas/common/evas_pipe.c
@@ -772,7 +772,7 @@ EAPI void
772evas_common_pipe_image_load(RGBA_Image *im) 772evas_common_pipe_image_load(RGBA_Image *im)
773{ 773{
774 if (im->flags & RGBA_IMAGE_TODO_LOAD) 774 if (im->flags & RGBA_IMAGE_TODO_LOAD)
775 return ; 775 return;
776 776
777 if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888 777 if (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888
778 && !evas_cache_image_is_loaded(&(im->cache_entry))) 778 && !evas_cache_image_is_loaded(&(im->cache_entry)))
@@ -781,7 +781,7 @@ evas_common_pipe_image_load(RGBA_Image *im)
781 if (!((!im->cs.data) || ((!im->cs.dirty) && (!(im->flags & RGBA_IMAGE_IS_DIRTY))))) 781 if (!((!im->cs.data) || ((!im->cs.dirty) && (!(im->flags & RGBA_IMAGE_IS_DIRTY)))))
782 goto add_task; 782 goto add_task;
783 783
784 return ; 784 return;
785 785
786 add_task: 786 add_task:
787 LKL(im_task_mutex); 787 LKL(im_task_mutex);
@@ -796,10 +796,10 @@ evas_common_pipe_text_prepare(Evas_Text_Props *text_props)
796 RGBA_Font_Int *fi; 796 RGBA_Font_Int *fi;
797 797
798 fi = text_props->font_instance; 798 fi = text_props->font_instance;
799 if (!fi) return ; 799 if (!fi) return;
800 800
801 if (!text_props->changed && text_props->generation == fi->generation && text_props->glyphs) 801 if (!text_props->changed && text_props->generation == fi->generation && text_props->glyphs)
802 return ; 802 return;
803 803
804 LKL(fi->ft_mutex); 804 LKL(fi->ft_mutex);
805 805
diff --git a/src/lib/evas/common/evas_rectangle_main.c b/src/lib/evas/common/evas_rectangle_main.c
index c4722426b4..28387b3609 100644
--- a/src/lib/evas/common/evas_rectangle_main.c
+++ b/src/lib/evas/common/evas_rectangle_main.c
@@ -90,7 +90,7 @@ evas_common_rectangle_draw_do(const Cutout_Rects *reuse,
90 clip->x, clip->y, 90 clip->x, clip->y,
91 clip->w, clip->h); 91 clip->w, clip->h);
92 rectangle_draw_internal(dst, dc, x, y, w, h); 92 rectangle_draw_internal(dst, dc, x, y, w, h);
93 return ; 93 return;
94 } 94 }
95 95
96 for (i = 0; i < reuse->active; ++i) 96 for (i = 0; i < reuse->active; ++i)
diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c
index b7490c6dc8..7a4f8aee4b 100644
--- a/src/lib/evas/file/evas_module.c
+++ b/src/lib/evas/file/evas_module.c
@@ -469,7 +469,7 @@ evas_module_unload(Evas_Module *em)
469 if (!em->loaded) 469 if (!em->loaded)
470 return; 470 return;
471 if (!em->definition) 471 if (!em->definition)
472 return ; 472 return;
473 473
474// for now lets not unload modules - they may still be in use. 474// for now lets not unload modules - they may still be in use.
475// em->definition->func.close(em); 475// em->definition->func.close(em);