Changeset ba02baa in mainline for uspace/lib/gui/window.c

Timestamp:

2014-01-16T17:23:30Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

62fbb7e

Parents:

dace86a

Message:

cstyle (no change in functionality)

File:

• uspace/lib/gui/window.c (modified) (6 diffs)

uspace/lib/gui/window.c

@@ -592 +592 @@
     const char *caption, sysarg_t x_offset, sysarg_t y_offset)
 {
-        int rc;
-
         window_t *win = (window_t *) malloc(sizeof(window_t));
-        if (!win) {
+        if (!win)
                 return NULL;
-        }
-
+        
         win->is_main = is_main;
         win->is_decorated = is_decorated;
@@ -604 +601 @@
         prodcons_initialize(&win->events);
         fibril_mutex_initialize(&win->guard);
+        
         widget_init(&win->root, NULL);
         win->root.window = win;
@@ -615 +613 @@
         win->focus = NULL;
         win->surface = NULL;
-
+        
         service_id_t reg_dsid;
-        async_sess_t *reg_sess;
-
-        rc = loc_service_get_id(winreg, &reg_dsid, 0);
+        int rc = loc_service_get_id(winreg, &reg_dsid, 0);
         if (rc != EOK) {
                 free(win);
                 return NULL;
         }
-
-        reg_sess = loc_service_connect(EXCHANGE_SERIALIZE, reg_dsid, 0);
+        
+        async_sess_t *reg_sess = loc_service_connect(EXCHANGE_SERIALIZE,
+            reg_dsid, 0);
         if (reg_sess == NULL) {
                 free(win);
                 return NULL;
         }
-
+        
         service_id_t in_dsid;
         service_id_t out_dsid;
-        
         rc = win_register(reg_sess, &in_dsid, &out_dsid, x_offset, y_offset);
         async_hangup(reg_sess);
@@ -640 +636 @@
                 return NULL;
         }
-
+        
         win->osess = loc_service_connect(EXCHANGE_SERIALIZE, out_dsid, 0);
         if (win->osess == NULL) {
@@ -646 +642 @@
                 return NULL;
         }
-
+        
         win->isess = loc_service_connect(EXCHANGE_SERIALIZE, in_dsid, 0);
         if (win->isess == NULL) {
@@ -653 +649 @@
                 return NULL;
         }
-
-        if (caption == NULL) {
+        
+        if (caption == NULL)
                 win->caption = NULL;
-        } else {
+        else
                 win->caption = str_dup(caption);
-        }
-
+        
         return win;
 }