[PATCH 07/13] wmaker: reorganisation of the control flow of the function 'findDock'

[Christophe CURIS]

Changed the code to return as soon as the result is known because it makes
the code simpler to understand, which is good for maintainability.

Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
---
 src/dock.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/dock.c b/src/dock.c
index e985152..e72c0c8 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -2042,29 +2042,29 @@ static WDock *findDock(WScreen *scr, XEvent *event, int 
*icon_pos)
        WDock *dock;
        int i;
 
-       *icon_pos = -1;
-
        dock = scr->dock;
        if (dock != NULL) {
                for (i = 0; i < dock->max_icons; i++) {
-                       if (dock->icon_array[i]
-                           && dock->icon_array[i]->icon->core->window == 
event->xclient.window) {
+                       if (dock->icon_array[i] &&
+                           dock->icon_array[i]->icon->core->window == 
event->xclient.window) {
                                *icon_pos = i;
-                               break;
+                               return dock;
                        }
                }
        }
-       if (*icon_pos < 0 && (dock = 
scr->workspaces[scr->current_workspace]->clip) != NULL) {
+
+       dock = scr->workspaces[scr->current_workspace]->clip;
+       if (dock != NULL) {
                for (i = 0; i < dock->max_icons; i++) {
-                       if (dock->icon_array[i]
-                           && dock->icon_array[i]->icon->core->window == 
event->xclient.window) {
+                       if (dock->icon_array[i] &&
+                           dock->icon_array[i]->icon->core->window == 
event->xclient.window) {
                                *icon_pos = i;
-                               break;
+                               return dock;
                        }
                }
        }
-       if (*icon_pos >= 0)
-               return dock;
+
+       *icon_pos = -1;
        return NULL;
 }
 
-- 
2.1.4


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.